From 10166c31c0f93535594784f8a2c52702435d5a0e Mon Sep 17 00:00:00 2001 From: jpr Date: Wed, 12 Mar 2003 13:36:37 +0000 Subject: [PATCH] =?utf8?q?malloc=20=E0=20la=20plce=20de=20g=5Fmalloc?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/gdcmJpeg.cxx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/gdcmJpeg.cxx b/src/gdcmJpeg.cxx index f0278c62..8f007c01 100644 --- a/src/gdcmJpeg.cxx +++ b/src/gdcmJpeg.cxx @@ -1,5 +1,5 @@ #include - +#include static ClbJpeg* ClbJpegAlloc(void); static void ClbJpegInit (ClbJpeg *); @@ -15,8 +15,8 @@ static BOOL ClbJpegFillHuffTable(ClbJpeg *); void _IdDcmJpegFree(ClbJpeg *jpg) { - g_free(jpg->DataImg); - g_free(jpg); + free(jpg->DataImg); + free(jpg); } @@ -49,7 +49,7 @@ int n; static ClbJpeg *ClbJpegAlloc(void) { ClbJpeg * jpg; - jpg = (ClbJpeg *)g_malloc(sizeof(ClbJpeg)); + jpg = (ClbJpeg *)malloc(sizeof(ClbJpeg)); ClbJpegInit(jpg); return jpg; } @@ -183,7 +183,7 @@ static BOOL ClbJpegReadHeader(ClbJpeg *jpg) jpg->lSof.SofTabPos=ftell(jpg->infp); - isLossLess=TRUE; + isLossLess=1; // TRUE } if (el==0xC4) @@ -268,7 +268,7 @@ static BOOL ClbJpegDecodeData(ClbJpeg *jpg) if (jpg->lSof.precision==16) mask=0xFFFF; - jpg->DataImg=(int*)g_malloc(jpg->lSof.Himg*jpg->lSof.Wimg*sizeof(*jpg->DataImg)); + jpg->DataImg=(int*)malloc(jpg->lSof.Himg*jpg->lSof.Wimg*sizeof(*jpg->DataImg)); memset( jpg->DataImg,0,(jpg->lSof.Himg*jpg->lSof.Wimg*sizeof(*jpg->DataImg))); if (!jpg->RestartInterval) -- 2.48.1