[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47752] trunk/blender/source/blender/imbuf /intern/jp2.c: minor changes to jpeg2k saving based on reading v1. 5 source examples.

[Campbell Barton]

Revision: 47752
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47752
Author:   campbellbarton
Date:     2012-06-11 18:43:16 +0000 (Mon, 11 Jun 2012)
Log Message:
-----------
minor changes to jpeg2k saving based on reading v1.5 source examples.

Modified Paths:
--------------
    trunk/blender/source/blender/imbuf/intern/jp2.c

Modified: trunk/blender/source/blender/imbuf/intern/jp2.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/jp2.c     2012-06-11 18:40:55 UTC 
(rev 47751)
+++ trunk/blender/source/blender/imbuf/intern/jp2.c     2012-06-11 18:43:16 UTC 
(rev 47752)
@@ -43,6 +43,7 @@
 static char JP2_HEAD[] = {0x0, 0x0, 0x0, 0x0C, 0x6A, 0x50, 0x20, 0x20, 0x0D, 
0x0A, 0x87, 0x0A};
 
 /* We only need this because of how the presets are set */
+/* this typedef is copied from 
'openjpeg-1.5.0/applications/codec/image_to_j2k.c' */
 typedef struct img_folder {
        /** The directory path of the folder containing input images*/
        char *imgdirpath;
@@ -515,7 +516,7 @@
        
        
        /* initialize image components */
-       memset(&cmptparm[0], 0, 4 * sizeof(opj_image_cmptparm_t));
+       memset(&cmptparm, 0, 4 * sizeof(opj_image_cmptparm_t));
        for (i = 0; i < numcomps; i++) {
                cmptparm[i].prec = prec;
                cmptparm[i].bpp = prec;
@@ -535,9 +536,9 @@
        /* set image offset and reference grid */
        image->x0 = parameters->image_offset_x0;
        image->y0 = parameters->image_offset_y0;
-       image->x1 = parameters->image_offset_x0 + (w - 1) * subsampling_dx + 1;
-       image->y1 = parameters->image_offset_y0 + (h - 1) * subsampling_dy + 1;
-       
+       image->x1 = image->x0 + (w - 1) * subsampling_dx + 1 + image->x0;
+       image->y1 = image->y0 + (h - 1) * subsampling_dy + 1 + image->y0;
+
        /* set image data */
        rect = (unsigned char *) ibuf->rect;
        rect_float = ibuf->rect_float;
@@ -720,7 +721,7 @@
                opj_cinfo_t *cinfo = opj_create_compress(CODEC_JP2);
 
                /* catch events using our callbacks and give a local context */
-               opj_set_event_mgr((opj_common_ptr)cinfo, &event_mgr, stderr);   
                
+               opj_set_event_mgr((opj_common_ptr)cinfo, &event_mgr, stderr);
 
                /* setup the encoder parameters using the current image and 
using user parameters */
                opj_setup_encoder(cinfo, &parameters, image);

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs