summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBehdad Esfahbod <pango@behdad.org>2005-06-21 23:30:25 +0000
committerBehdad Esfahbod <behdad@src.gnome.org>2005-06-21 23:30:25 +0000
commit02409403aa681fb3ded2c9c28a58ac6d4110fcdb (patch)
treeb5aeeac2ea361dbd2b08ed9a6a4f4a6206fe2d70
parentdf47e3181d2e08b09220f4d3fed62f1bda59a229 (diff)
downloadpango-02409403aa681fb3ded2c9c28a58ac6d4110fcdb.tar.gz
Fix C89 var after code issues.
2005-06-21 Behdad Esfahbod <pango@behdad.org> * modules/khmer/khmer-fc.c: Fix C89 var after code issues. * modules/khmer/.cvsignore: Copied from other modules.
-rw-r--r--ChangeLog6
-rw-r--r--ChangeLog.pre-1-106
-rw-r--r--modules/khmer/.cvsignore7
-rw-r--r--modules/khmer/khmer-fc.c8
4 files changed, 24 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 503854a6..194d00a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-06-21 Behdad Esfahbod <pango@behdad.org>
+
+ * modules/khmer/khmer-fc.c: Fix C89 var after code issues.
+
+ * modules/khmer/.cvsignore: Copied from other modules.
+
2005-06-21 Owen Taylor <otaylor@redhat.com>
* pango/pangoxft-render.c (get_renderer): Go back to
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 503854a6..194d00a8 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,9 @@
+2005-06-21 Behdad Esfahbod <pango@behdad.org>
+
+ * modules/khmer/khmer-fc.c: Fix C89 var after code issues.
+
+ * modules/khmer/.cvsignore: Copied from other modules.
+
2005-06-21 Owen Taylor <otaylor@redhat.com>
* pango/pangoxft-render.c (get_renderer): Go back to
diff --git a/modules/khmer/.cvsignore b/modules/khmer/.cvsignore
new file mode 100644
index 00000000..13aeb3b7
--- /dev/null
+++ b/modules/khmer/.cvsignore
@@ -0,0 +1,7 @@
+Makefile
+Makefile.in
+.deps
+.libs
+*.lo
+*.la
+
diff --git a/modules/khmer/khmer-fc.c b/modules/khmer/khmer-fc.c
index cc6c09a8..6e4c4e12 100644
--- a/modules/khmer/khmer-fc.c
+++ b/modules/khmer/khmer-fc.c
@@ -497,6 +497,7 @@ khmer_engine_shape (PangoEngineShape *engine,
PangoFcFont *fc_font = PANGO_FC_FONT (font);
FT_Face face;
PangoOTBuffer *buffer;
+ PangoOTRuleset *ruleset;
glong n_chars, i;
gunichar *wcs;
const char *p;
@@ -515,13 +516,14 @@ khmer_engine_shape (PangoEngineShape *engine,
*/
while (cursor < n_chars)
{
- syllable = find_syllable (wcs, cursor, n_chars);
-
/* write a pre vowel or the pre part of a split vowel first
* and look out for coeng + ro. RO is the only vowel of type 2, and
* therefore the only one that requires saving space before the base.
*/
glong coengRo = -1; /* There is no Coeng Ro, if found this value will change */
+
+ syllable = find_syllable (wcs, cursor, n_chars);
+
for (i = cursor; i < syllable; i += 1)
{
charClass = get_char_class (wcs[i]);
@@ -678,7 +680,7 @@ khmer_engine_shape (PangoEngineShape *engine,
} /* while */
/* do gsub processing */
- PangoOTRuleset *ruleset = get_ruleset (face);
+ ruleset = get_ruleset (face);
if (ruleset != NULL)
{
pango_ot_ruleset_substitute (ruleset, buffer);