Release 10.35.41

git-svn-id: http://svn.code.sf.net/p/netpbm/code/stable@608 9d0c8265-081b-0410-96cb-a4ca84ce46f8

4 files changed, 24 insertions, 5 deletions

diff --git a/Makefile.version b/Makefile.version
index 6f3fa189..219a16c3 100644
--- a/Makefile.version
+++ b/Makefile.version
@@ -1,3 +1,3 @@
 NETPBM_MAJOR_RELEASE = 10
 NETPBM_MINOR_RELEASE = 35
-NETPBM_POINT_RELEASE = 40
+NETPBM_POINT_RELEASE = 41
diff --git a/doc/HISTORY b/doc/HISTORY
index 71add4be..efc8188e 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -4,6 +4,13 @@ Netpbm.
 CHANGE HISTORY 
 --------------
 
+08.03.28 BJH  Release 10.35.41
+
+              pnmnorm: fix -colorvalue, -saturation, -keephues options.
+
+              Build: make it work with Gcc 4.3 and -sse by omitting
+              MMX/SSE optimizations.
+
 08.03.08 BJH  Release 10.35.40
 
               pgmdeshadow: fix crash in option processing.
diff --git a/editor/pnmnorm.c b/editor/pnmnorm.c
index 51d954a8..91c4b03a 100644
--- a/editor/pnmnorm.c
+++ b/editor/pnmnorm.c
@@ -608,7 +608,7 @@ main(int argc, char *argv[]) {
         for (row = 0; row < rows; ++row) {
             pnm_readpnmrow(ifP, xelrow, cols, maxval, format);
             writeRowNormalized(xelrow, cols, maxval, format,
-                               cmdline.keephues, cmdline.brightMethod,
+                               cmdline.brightMethod, cmdline.keephues,
                                newBrightness, rowbuf);
         }
         free(newBrightness);
diff --git a/lib/libpbm3.c b/lib/libpbm3.c
index cb6edd5b..9c9bbd25 100644
--- a/lib/libpbm3.c
+++ b/lib/libpbm3.c
@@ -14,9 +14,21 @@
 #include "libpbm.h"
 #include "bitreverse.h"
 
-#if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__ >= 301) && defined (__SSE__)
-/* intel MMX-SSE enhancement for pbm_writepbmowraw() */
-/* GCC only.  Turn on with -msse */
+/* HAVE_MMX_SSE means we have the means to use MMX and SSE CPU facilities
+   to make PBM raster processing faster.
+
+   The GNU Compiler -msse option makes SSE available.
+*/
+
+#if defined(__GNUC__) && \
+  (__GNUC__ * 100 + __GNUC_MINOR__ >= 301) && \
+  (__GNUC__ * 100 + __GNUC_MINOR__ < 403) && \
+  defined (__SSE__)
+/* GCC 4.3 does have the facility, but it is different from what this
+   code knows how to use.  In particular, the calls to
+   __builtin_ia32_pcmpeqb() and __builtin_ia32_pmovmskb() fail to
+   compile, with complaints of improper argument types.
+*/
 
 #define HAVE_MMX_SSE 1
 #else