[trunk] Import patch from sumatrapdf team. This handle testcase 2.pdf.SIGFPE.706...
[openjpeg.git] / src / lib / openjp3d / volume.c
old mode 100755 (executable)
new mode 100644 (file)
index 35728da..669b613
@@ -1,89 +1,91 @@
-/*\r
- * Copyright (c) 2005, Herve Drolon, FreeImage Team\r
- * All rights reserved.\r
- *\r
- * Redistribution and use in source and binary forms, with or without\r
- * modification, are permitted provided that the following conditions\r
- * are met:\r
- * 1. Redistributions of source code must retain the above copyright\r
- *    notice, this list of conditions and the following disclaimer.\r
- * 2. Redistributions in binary form must reproduce the above copyright\r
- *    notice, this list of conditions and the following disclaimer in the\r
- *    documentation and/or other materials provided with the distribution.\r
- *\r
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'\r
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\r
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\r
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE\r
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR\r
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF\r
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS\r
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN\r
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)\r
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE\r
- * POSSIBILITY OF SUCH DAMAGE.\r
- */\r
-\r
-#include "opj_includes.h"\r
-\r
-opj_volume_t* OPJ_CALLCONV opj_volume_create(int numcmpts, opj_volume_cmptparm_t *cmptparms, OPJ_COLOR_SPACE clrspc) {\r
-       int compno;\r
-       opj_volume_t *volume = NULL;\r
-\r
-       volume = (opj_volume_t*)opj_malloc(sizeof(opj_volume_t));\r
-       if(volume) {\r
-               volume->color_space = clrspc;\r
-               volume->numcomps = numcmpts;\r
-               /* allocate memory for the per-component information */\r
-               volume->comps = (opj_volume_comp_t*)opj_malloc(volume->numcomps * sizeof(opj_volume_comp_t));\r
-               if(!volume->comps) {\r
-                       opj_volume_destroy(volume);\r
-                       return NULL;\r
-               }\r
-               /* create the individual volume components */\r
-               for(compno = 0; compno < numcmpts; compno++) {\r
-                       opj_volume_comp_t *comp = &volume->comps[compno];\r
-                       comp->dx = cmptparms[compno].dx;\r
-                       comp->dy = cmptparms[compno].dy;\r
-                       comp->dz = cmptparms[compno].dz;\r
-                       comp->w = cmptparms[compno].w;\r
-                       comp->h = cmptparms[compno].h;\r
-                       comp->l = cmptparms[compno].l;\r
-                       comp->x0 = cmptparms[compno].x0;\r
-                       comp->y0 = cmptparms[compno].y0;\r
-                       comp->z0 = cmptparms[compno].z0;\r
-                       comp->prec = cmptparms[compno].prec;\r
-                       comp->bpp = cmptparms[compno].bpp;\r
-                       comp->sgnd = cmptparms[compno].sgnd;\r
-                       comp->bigendian = cmptparms[compno].bigendian;\r
-                       comp->dcoffset = cmptparms[compno].dcoffset;\r
-                       comp->data = (int*)opj_malloc(comp->w * comp->h * comp->l * sizeof(int));\r
-                       if(!comp->data) {\r
-                               fprintf(stdout,"Unable to malloc comp->data (%d x %d x %d x bytes)",comp->w,comp->h,comp->l);\r
-                               opj_volume_destroy(volume);\r
-                               return NULL;\r
-                       }\r
-                       //fprintf(stdout,"%d %d %d %d %d %d %d %d %d", comp->w,comp->h, comp->l, comp->dx, comp->dy, comp->dz, comp->prec, comp->bpp, comp->sgnd);\r
-               }\r
-       }\r
-\r
-       return volume;\r
-}\r
-\r
-void OPJ_CALLCONV opj_volume_destroy(opj_volume_t *volume) {\r
-       int i;\r
-       if(volume) {\r
-               if(volume->comps) {\r
-                       /* volume components */\r
-                       for(i = 0; i < volume->numcomps; i++) {\r
-                               opj_volume_comp_t *volume_comp = &volume->comps[i];\r
-                               if(volume_comp->data) {\r
-                                       opj_free(volume_comp->data);\r
-                               }\r
-                       }\r
-                       opj_free(volume->comps);\r
-               }\r
-               opj_free(volume);\r
-       }\r
-}\r
-\r
+/*
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "opj_includes.h"
+#include "volume.h"
+#include "openjp3d.h"
+
+opj_volume_t* OPJ_CALLCONV opj_volume_create(int numcmpts, opj_volume_cmptparm_t *cmptparms, OPJ_COLOR_SPACE clrspc) {
+       int compno;
+       opj_volume_t *volume = NULL;
+
+       volume = (opj_volume_t*)opj_malloc(sizeof(opj_volume_t));
+       if(volume) {
+               volume->color_space = clrspc;
+               volume->numcomps = numcmpts;
+               /* allocate memory for the per-component information */
+               volume->comps = (opj_volume_comp_t*)opj_malloc(volume->numcomps * sizeof(opj_volume_comp_t));
+               if(!volume->comps) {
+                       opj_volume_destroy(volume);
+                       return NULL;
+               }
+               /* create the individual volume components */
+               for(compno = 0; compno < numcmpts; compno++) {
+                       opj_volume_comp_t *comp = &volume->comps[compno];
+                       comp->dx = cmptparms[compno].dx;
+                       comp->dy = cmptparms[compno].dy;
+                       comp->dz = cmptparms[compno].dz;
+                       comp->w = cmptparms[compno].w;
+                       comp->h = cmptparms[compno].h;
+                       comp->l = cmptparms[compno].l;
+                       comp->x0 = cmptparms[compno].x0;
+                       comp->y0 = cmptparms[compno].y0;
+                       comp->z0 = cmptparms[compno].z0;
+                       comp->prec = cmptparms[compno].prec;
+                       comp->bpp = cmptparms[compno].bpp;
+                       comp->sgnd = cmptparms[compno].sgnd;
+                       comp->bigendian = cmptparms[compno].bigendian;
+                       comp->dcoffset = cmptparms[compno].dcoffset;
+                       comp->data = (int*)opj_malloc(comp->w * comp->h * comp->l * sizeof(int));
+                       if(!comp->data) {
+                               fprintf(stdout,"Unable to malloc comp->data (%d x %d x %d x bytes)",comp->w,comp->h,comp->l);
+                               opj_volume_destroy(volume);
+                               return NULL;
+                       }
+                       /*fprintf(stdout,"%d %d %d %d %d %d %d %d %d", comp->w,comp->h, comp->l, comp->dx, comp->dy, comp->dz, comp->prec, comp->bpp, comp->sgnd);*/
+               }
+       }
+
+       return volume;
+}
+
+void OPJ_CALLCONV opj_volume_destroy(opj_volume_t *volume) {
+       int i;
+       if(volume) {
+               if(volume->comps) {
+                       /* volume components */
+                       for(i = 0; i < volume->numcomps; i++) {
+                               opj_volume_comp_t *volume_comp = &volume->comps[i];
+                               if(volume_comp->data) {
+                                       opj_free(volume_comp->data);
+                               }
+                       }
+                       opj_free(volume->comps);
+               }
+               opj_free(volume);
+       }
+}
+