[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33193] trunk/blender/source/blender: WITH_OPENJPEG wasn't defined for CMake or SCons, which meant blender couldn't save jpeg2000 images from the file selector.

[Campbell Barton]

Revision: 33193
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33193
Author:   campbellbarton
Date:     2010-11-20 15:19:21 +0100 (Sat, 20 Nov 2010)

Log Message:
-----------
WITH_OPENJPEG wasn't defined for CMake or SCons, which meant blender couldn't save jpeg2000 images from the file selector.
also fixed typo in jp2.c

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_image/CMakeLists.txt
    trunk/blender/source/blender/editors/space_image/SConscript
    trunk/blender/source/blender/imbuf/intern/jp2.c

Modified: trunk/blender/source/blender/editors/space_image/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/space_image/CMakeLists.txt	2010-11-20 09:48:51 UTC (rev 33192)
+++ trunk/blender/source/blender/editors/space_image/CMakeLists.txt	2010-11-20 14:19:21 UTC (rev 33193)
@@ -40,6 +40,10 @@
 	space_image.c
 )
 
+IF(WITH_IMAGE_OPENJPEG)
+	ADD_DEFINITIONS(-DWITH_OPENJPEG)
+ENDIF(WITH_IMAGE_OPENJPEG)
+
 IF(WITH_IMAGE_OPENEXR)
 	ADD_DEFINITIONS(-DWITH_OPENEXR)
 ENDIF(WITH_IMAGE_OPENEXR)

Modified: trunk/blender/source/blender/editors/space_image/SConscript
===================================================================
--- trunk/blender/source/blender/editors/space_image/SConscript	2010-11-20 09:48:51 UTC (rev 33192)
+++ trunk/blender/source/blender/editors/space_image/SConscript	2010-11-20 14:19:21 UTC (rev 33193)
@@ -14,11 +14,13 @@
     incs += ' ' + env['BF_LCMS_INC']
 if env['WITH_BF_OPENEXR']:
     defs.append('WITH_OPENEXR')
+if env['WITH_BF_OPENJPEG']:
+    defs.append('WITH_OPENJPEG')
 if env['WITH_BF_TIFF']:
     defs.append('WITH_TIFF')
 if env['WITH_BF_CINEON']:
 	defs.append('WITH_CINEON')
-    
+
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
     incs += ' ' + env['BF_PTHREADS_INC']
 

Modified: trunk/blender/source/blender/imbuf/intern/jp2.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/jp2.c	2010-11-20 09:48:51 UTC (rev 33192)
+++ trunk/blender/source/blender/imbuf/intern/jp2.c	2010-11-20 14:19:21 UTC (rev 33193)
@@ -55,14 +55,14 @@
 	float *rates;
 }img_fol_t;
 
-static int checkj2p(unsigned char *mem) /* J2K_CFMT */
+static int check_jp2(unsigned char *mem) /* J2K_CFMT */
 {
 	return memcmp(JP2_HEAD, mem, 12) ? 0 : 1;
 }
 
 int imb_is_a_jp2(unsigned char *buf)
 {	
-	return checkj2p(buf);
+	return check_jp2(buf);
 }
 
 
@@ -112,7 +112,7 @@
 	opj_dinfo_t* dinfo = NULL;	/* handle to a decompressor */
 	opj_cio_t *cio = NULL;
 
-	if (checkj2p(mem) == 0) return(0);
+	if (check_jp2(mem) == 0) return(0);
 
 	/* configure the event callbacks (not required) */
 	memset(&event_mgr, 0, sizeof(opj_event_mgr_t));