*** empty log message ***

diff --git a/bin/booh-backend b/bin/booh-backend
index 230d23de375d4c1dc80f88da915dc33fbda0b5db..cb7b61968d30a26c9a9f1e986311ae4e3b09ccd7 100755 (executable)
--- a/bin/booh-backend
+++ b/bin/booh-backend
@@ -21,6 +21,7 @@
 
 require 'getoptlong'
 require 'gettext'
+require 'gettext/locale'
 include GetText
 require 'booh/rexml/document'
 include REXML
@@ -30,6 +31,8 @@ require 'booh/html-merges'
 
 #- bind text domain as soon as possible because some _() functions are called early to build data structures
 bindtextdomain("booh")
+#- save locale for restoring for multi languages
+$default_locale = Locale.get
 
 #- options
 $options = [
@@ -659,7 +662,7 @@ def find_translation_for_file(file, msg)
         if file =~ /\.(\w\w)\.html$/
             bindtextdomain("booh", { :locale => "#{$1}.UTF-8" })
             retval = _(msg)
-            bindtextdomain("booh")
+            bindtextdomain("booh", { :locale => $default_locale })
             return retval
         else
             die "Internal error: cannot find multi language suffix of file '#{file}'"
@@ -697,7 +700,7 @@ def save_html(html, base_filename)
             ios = File.open("#{base_filename}.#{language}.html", "w")
             ios.write(html.gsub(/@@(.*?)@@/) { _($1) })
             ios.close
-            bindtextdomain("booh")
+            bindtextdomain("booh", { :locale => $default_locale })
         end
     else
         ios = File.open("#{base_filename}.html", "w")

diff --git a/ext/rbbooh.c b/ext/rbbooh.c
index 2e59e9264f0e656d71db5e113105e65bb65de30b..ae7ce9b5896c1176853ff09e33fa0d7be40961b6 100644 (file)
--- a/ext/rbbooh.c
+++ b/ext/rbbooh.c
@@ -50,8 +50,8 @@ static VALUE whitebalance(VALUE self, VALUE level) {
         for (y = 0; y < gdk_pixbuf_get_height(_SELF(self)); y++) {
                 guchar* pixline = &(pixels[rowstride*y]);
                 for (x = 0; x < gdk_pixbuf_get_width(_SELF(self)); x++) {
-                        pixline[x*3]   = red_filter[pixline[x*3]];
-                        pixline[x*3+2] = blue_filter[pixline[x*3+2]];
+                        pixline[x*3]   = (guchar) red_filter[pixline[x*3]];
+                        pixline[x*3+2] = (guchar) blue_filter[pixline[x*3+2]];
                 }
         }
 
@@ -76,9 +76,9 @@ static VALUE gammacorrect(VALUE self, VALUE level) {
         for (y = 0; y < gdk_pixbuf_get_height(_SELF(self)); y++) {
                 guchar* pixline = &(pixels[rowstride*y]);
                 for (x = 0; x < gdk_pixbuf_get_width(_SELF(self)); x++) {
-                        pixline[x*3]   = filter[pixline[x*3]];
-                        pixline[x*3+1] = filter[pixline[x*3+1]];
-                        pixline[x*3+2] = filter[pixline[x*3+2]];
+                        pixline[x*3]   = (guchar) filter[pixline[x*3]];
+                        pixline[x*3+1] = (guchar) filter[pixline[x*3+1]];
+                        pixline[x*3+2] = (guchar) filter[pixline[x*3+2]];
                 }
         }