X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2Fgdcmopenjpeg%2Fcodec%2Fconvert.c;h=2aeed36698aa3746ac6c905388a33544dbc43d10;hb=779c8f5232ad160d353b90d3fa47d0503e17965d;hp=4ac93ba80560c1e0b6853fc5ef5d7e42cd149e57;hpb=4a329f344f3c1bb97fc191df56a2c9a36319744d;p=gdcm.git diff --git a/src/gdcmopenjpeg/codec/convert.c b/src/gdcmopenjpeg/codec/convert.c index 4ac93ba8..2aeed366 100644 --- a/src/gdcmopenjpeg/codec/convert.c +++ b/src/gdcmopenjpeg/codec/convert.c @@ -179,13 +179,11 @@ int bmptoimage(char *filename, j2k_image_t * img, int subsampling_dx, img->x0 = Dim[0]; img->y0 = Dim[1]; img->x1 = - !Dim[0] ? (w - 1) * subsampling_dx + 1 : Dim[0] + (w - - 1) * - subsampling_dx + 1; + !Dim[0] ? (w - 1) * subsampling_dx + 1 : Dim[0] + (w - 1) * + subsampling_dx + 1; img->y1 = - !Dim[1] ? (h - 1) * subsampling_dy + 1 : Dim[1] + (h - - 1) * - subsampling_dy + 1; + !Dim[1] ? (h - 1) * subsampling_dy + 1 : Dim[1] + (h - 1) * + subsampling_dy + 1; img->numcomps = 3; img->color_space = 1; img->comps = @@ -484,7 +482,7 @@ int bmptoimage(char *filename, j2k_image_t * img, int subsampling_dx, fprintf(Compo1, "%c", table_G[(int) RGB[(Info_h.biHeight - line - 1) * Info_h.biWidth + col]]); - fprintf(Compo2, "%c", table_B[(int) + fprintf(Compo2, "%c", table_B[(int) RGB[(Info_h.biHeight - line - 1) * Info_h.biWidth + col]]); }