]> granicus.if.org Git - openjpeg/commitdiff
remove deprecated v1 style function jp2_write_colr
authorMickael Savinaud <savmickael@users.noreply.github.com>
Mon, 13 Aug 2012 09:33:00 +0000 (09:33 +0000)
committerMickael Savinaud <savmickael@users.noreply.github.com>
Mon, 13 Aug 2012 09:33:00 +0000 (09:33 +0000)
libopenjpeg/jp2.c

index b73b7578e206bcf33dc235a77307373ef0757834..8516e4a6fb355a6800ec8c795c2847a650efef91 100644 (file)
@@ -98,8 +98,6 @@ static opj_bool opj_jp2_read_cdef(    opj_jp2_v2_t * jp2,
                                     OPJ_BYTE * p_cdef_header_data,
                                                                        OPJ_UINT32 p_cdef_header_size,
                                                                        opj_event_mgr_t * p_manager );
-
-static void jp2_write_colr(opj_jp2_t *jp2, opj_cio_t *cio);
 /**
  * Writes the Colour Specification box.
  *
@@ -651,7 +649,8 @@ OPJ_BYTE * opj_jp2_write_ihdr(opj_jp2_v2_t *jp2,
  * @return     the data being copied.
 */
 OPJ_BYTE * opj_jp2_write_bpcc( opj_jp2_v2_t *jp2, 
-                                                       OPJ_UINT32 * p_nb_bytes_written );
+                                                       OPJ_UINT32 * p_nb_bytes_written 
+                                )
 {
        unsigned int i;
        /* room for 8 bytes for box and 1 byte for each component */
@@ -730,28 +729,6 @@ opj_bool opj_jp2_read_bpcc( opj_jp2_v2_t *jp2,
        return OPJ_TRUE;
 }
 
-static void jp2_write_colr(opj_jp2_t *jp2, opj_cio_t *cio) {
-       opj_jp2_box_t box;
-
-       box.init_pos = cio_tell(cio);
-       cio_skip(cio, 4);
-       cio_write(cio, JP2_COLR, 4);            /* COLR */
-
-       cio_write(cio, jp2->meth, 1);           /* METH */
-       cio_write(cio, jp2->precedence, 1);     /* PRECEDENCE */
-       cio_write(cio, jp2->approx, 1);         /* APPROX */
-
-       if(jp2->meth == 2)
-        jp2->enumcs = 0;
-
-       cio_write(cio, jp2->enumcs, 4); /* EnumCS */
-
-       box.length = cio_tell(cio) - box.init_pos;
-       cio_seek(cio, box.init_pos);
-       cio_write(cio, box.length, 4);  /* L */
-       cio_seek(cio, box.init_pos + box.length);
-}
-
 /**
  * Writes the Colour Specification box.
  *