git.cweiske.de
/
enigma2.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4b75db3
)
gdi/picexif.cpp: more and more FD leak stuff
author
ghost
<andreas.monzner@multimedia-labs.de>
Tue, 5 Apr 2011 14:10:31 +0000
(16:10 +0200)
committer
ghost
<andreas.monzner@multimedia-labs.de>
Tue, 5 Apr 2011 14:10:31 +0000
(16:10 +0200)
refs bug #599
lib/gdi/picexif.cpp
patch
|
blob
|
history
diff --git
a/lib/gdi/picexif.cpp
b/lib/gdi/picexif.cpp
index 8383ee2ff0f725624659b0f286351fb88357aca5..42479429285220347d4b4cff0bd6628a115eb0af 100644
(file)
--- a/
lib/gdi/picexif.cpp
+++ b/
lib/gdi/picexif.cpp
@@
-108,7
+108,7
@@
bool Cexif::DecodeExif(const char *filename, int Thumb)
strcpy(m_szLastError,"EXIF-Data not found");
if (a != 0xff || fgetc(hFile) != M_SOI)
strcpy(m_szLastError,"EXIF-Data not found");
if (a != 0xff || fgetc(hFile) != M_SOI)
- goto decode_exif_out;
+ goto decode_exif_out
_false
;
for(;;)
{
for(;;)
{
@@
-119,7
+119,7
@@
bool Cexif::DecodeExif(const char *filename, int Thumb)
if (SectionsRead >= MAX_SECTIONS)
{
strcpy(m_szLastError,"Too many sections in jpg file");
if (SectionsRead >= MAX_SECTIONS)
{
strcpy(m_szLastError,"Too many sections in jpg file");
- goto decode_exif_out;
+ goto decode_exif_out
_false
;
}
for (a=0;a<7;a++)
}
for (a=0;a<7;a++)
@@
-130,14
+130,14
@@
bool Cexif::DecodeExif(const char *filename, int Thumb)
if (a >= 6)
{
strcpy(m_szLastError,"too many padding unsigned chars\n");
if (a >= 6)
{
strcpy(m_szLastError,"too many padding unsigned chars\n");
- goto decode_exif_out;
+ goto decode_exif_out
_false
;
}
}
if (marker == 0xff)
{
strcpy(m_szLastError,"too many padding unsigned chars!");
}
}
if (marker == 0xff)
{
strcpy(m_szLastError,"too many padding unsigned chars!");
- goto decode_exif_out;
+ goto decode_exif_out
_false
;
}
Sections[SectionsRead].Type = marker;
}
Sections[SectionsRead].Type = marker;
@@
-150,7
+150,7
@@
bool Cexif::DecodeExif(const char *filename, int Thumb)
if (itemlen < 2)
{
strcpy(m_szLastError,"invalid marker");
if (itemlen < 2)
{
strcpy(m_szLastError,"invalid marker");
- goto decode_exif_out;
+ goto decode_exif_out
_false
;
}
Sections[SectionsRead].Size = itemlen;
}
Sections[SectionsRead].Size = itemlen;
@@
-158,7
+158,7
@@
bool Cexif::DecodeExif(const char *filename, int Thumb)
if (Data == NULL)
{
strcpy(m_szLastError,"Could not allocate memory");
if (Data == NULL)
{
strcpy(m_szLastError,"Could not allocate memory");
- goto decode_exif_out;
+ goto decode_exif_out
_false
;
}
Sections[SectionsRead].Data = Data;
}
Sections[SectionsRead].Data = Data;
@@
-170,17
+170,17
@@
bool Cexif::DecodeExif(const char *filename, int Thumb)
if (got != itemlen-2)
{
strcpy(m_szLastError,"Premature end of file?");
if (got != itemlen-2)
{
strcpy(m_szLastError,"Premature end of file?");
- goto decode_exif_out;
+ goto decode_exif_out
_false
;
}
SectionsRead += 1;
switch(marker)
{
case M_SOS:
}
SectionsRead += 1;
switch(marker)
{
case M_SOS:
- goto decode_exif_out;
+ goto decode_exif_out
_true
;
case M_EOI:
printf("No image in jpeg!\n");
case M_EOI:
printf("No image in jpeg!\n");
- goto decode_exif_out;
+ goto decode_exif_out
_false
;
case M_COM:
if (HaveCom)
{
case M_COM:
if (HaveCom)
{
@@
-227,9
+227,11
@@
bool Cexif::DecodeExif(const char *filename, int Thumb)
break;
}
}
break;
}
}
+
+decode_exif_out_true:
ret = true;
ret = true;
-decode_exif_out:
+decode_exif_out
_false
:
fclose(hFile);
return ret;
}
fclose(hFile);
return ret;
}