projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wxDisplay::GetFromWindow is only on msw evidently
[wxWidgets.git]
/
src
/
common
/
gifdecod.cpp
diff --git
a/src/common/gifdecod.cpp
b/src/common/gifdecod.cpp
index bf5280b4ef0e06221928b33c4b0ec6b5becff71c..f49f473d3baa03e1522ee55ee101b17ca7b9b621 100644
(file)
--- a/
src/common/gifdecod.cpp
+++ b/
src/common/gifdecod.cpp
@@
-116,7
+116,7
@@
bool wxGIFDecoder::ConvertToImage(wxImage *image) const
image->Create(GetWidth(), GetHeight());
if (!image->Ok())
image->Create(GetWidth(), GetHeight());
if (!image->Ok())
- return
FALSE
;
+ return
false
;
pal = GetPalette();
src = GetData();
pal = GetPalette();
src = GetData();
@@
-143,7
+143,7
@@
bool wxGIFDecoder::ConvertToImage(wxImage *image) const
image->SetMaskColour(255, 0, 255);
}
else
image->SetMaskColour(255, 0, 255);
}
else
- image->SetMask(
FALSE
);
+ image->SetMask(
false
);
#if wxUSE_PALETTE
if (pal)
#if wxUSE_PALETTE
if (pal)
@@
-171,7
+171,7
@@
bool wxGIFDecoder::ConvertToImage(wxImage *image) const
*(dst++) = pal[3 * (*src) + 2];
}
*(dst++) = pal[3 * (*src) + 2];
}
- return
TRUE
;
+ return
true
;
}
}
@@
-208,27
+208,27
@@
bool wxGIFDecoder::IsAnimation() const { return (m_nimages > 1); }
bool wxGIFDecoder::GoFirstFrame()
{
if (!IsAnimation())
bool wxGIFDecoder::GoFirstFrame()
{
if (!IsAnimation())
- return
FALSE
;
+ return
false
;
m_image = 1;
m_pimage = m_pfirst;
m_image = 1;
m_pimage = m_pfirst;
- return
TRUE
;
+ return
true
;
}
bool wxGIFDecoder::GoLastFrame()
{
if (!IsAnimation())
}
bool wxGIFDecoder::GoLastFrame()
{
if (!IsAnimation())
- return
FALSE
;
+ return
false
;
m_image = m_nimages;
m_pimage = m_plast;
m_image = m_nimages;
m_pimage = m_plast;
- return
TRUE
;
+ return
true
;
}
bool wxGIFDecoder::GoNextFrame(bool cyclic)
{
if (!IsAnimation())
}
bool wxGIFDecoder::GoNextFrame(bool cyclic)
{
if (!IsAnimation())
- return
FALSE
;
+ return
false
;
if ((m_image < m_nimages) || (cyclic))
{
if ((m_image < m_nimages) || (cyclic))
{
@@
-241,16
+241,16
@@
bool wxGIFDecoder::GoNextFrame(bool cyclic)
m_pimage = m_pfirst;
}
m_pimage = m_pfirst;
}
- return
TRUE
;
+ return
true
;
}
else
}
else
- return
FALSE
;
+ return
false
;
}
bool wxGIFDecoder::GoPrevFrame(bool cyclic)
{
if (!IsAnimation())
}
bool wxGIFDecoder::GoPrevFrame(bool cyclic)
{
if (!IsAnimation())
- return
FALSE
;
+ return
false
;
if ((m_image > 1) || (cyclic))
{
if ((m_image > 1) || (cyclic))
{
@@
-263,30
+263,32
@@
bool wxGIFDecoder::GoPrevFrame(bool cyclic)
m_pimage = m_plast;
}
m_pimage = m_plast;
}
- return
TRUE
;
+ return
true
;
}
else
}
else
- return
FALSE
;
+ return
false
;
}
bool wxGIFDecoder::GoFrame(int which)
{
}
bool wxGIFDecoder::GoFrame(int which)
{
- int i;
-
if (!IsAnimation())
if (!IsAnimation())
- return
FALSE
;
+ return
false
;
if ((which >= 1) && (which <= m_nimages))
{
if ((which >= 1) && (which <= m_nimages))
{
+ m_image = 1;
m_pimage = m_pfirst;
m_pimage = m_pfirst;
- for (i = 0; i < which; i++)
+ while (m_image < which)
+ {
+ m_image++;
m_pimage = m_pimage->next;
m_pimage = m_pimage->next;
+ }
- return
TRUE
;
+ return
true
;
}
else
}
else
- return
FALSE
;
+ return
false
;
}
}
@@
-612,16
+614,16
@@
as an End of Information itself)
// CanRead:
// CanRead:
-// Returns
TRUE if the file looks like a valid GIF, FALSE
otherwise.
+// Returns
true if the file looks like a valid GIF, false
otherwise.
//
bool wxGIFDecoder::CanRead()
{
unsigned char buf[3];
if ( !m_f->Read(buf, WXSIZEOF(buf)) )
//
bool wxGIFDecoder::CanRead()
{
unsigned char buf[3];
if ( !m_f->Read(buf, WXSIZEOF(buf)) )
- return
FALSE
;
+ return
false
;
- m_f->SeekI(-(
off_
t)WXSIZEOF(buf), wxFromCurrent);
+ m_f->SeekI(-(
wxFileOffse
t)WXSIZEOF(buf), wxFromCurrent);
return memcmp(buf, "GIF", WXSIZEOF(buf)) == 0;
}
return memcmp(buf, "GIF", WXSIZEOF(buf)) == 0;
}
@@
-663,7
+665,7
@@
int wxGIFDecoder::ReadGIF()
if (memcmp(buf + 3, "89a", 3) < 0)
{
if (memcmp(buf + 3, "89a", 3) < 0)
{
- m_anim =
FALSE
;
+ m_anim =
false
;
}
/* read logical screen descriptor block (LSDB) */
}
/* read logical screen descriptor block (LSDB) */
@@
-701,7
+703,7
@@
int wxGIFDecoder::ReadGIF()
pprev = NULL;
pimg = NULL;
pprev = NULL;
pimg = NULL;
- bool done =
FALSE
;
+ bool done =
false
;
while(!done)
{
while(!done)
{
@@
-727,7
+729,7
@@
int wxGIFDecoder::ReadGIF()
/* end of data? */
if (type == 0x3B)
{
/* end of data? */
if (type == 0x3B)
{
- done =
TRUE
;
+ done =
true
;
}
else
/* extension block? */
}
else
/* extension block? */
@@
-752,7
+754,7
@@
int wxGIFDecoder::ReadGIF()
transparent = buf[4];
/* read disposal method */
transparent = buf[4];
/* read disposal method */
- disposal = (
buf[1] & 0x1C
) - 1;
+ disposal = (
(buf[1] & 0x1C) >> 2
) - 1;
}
else
/* other extension, skip */
}
else
/* other extension, skip */
@@
-762,7
+764,7
@@
int wxGIFDecoder::ReadGIF()
m_f->SeekI(i, wxFromCurrent);
if (m_f->Eof())
{
m_f->SeekI(i, wxFromCurrent);
if (m_f->Eof())
{
- done =
TRUE
;
+ done =
true
;
break;
}
}
break;
}
}
@@
-857,7
+859,7
@@
int wxGIFDecoder::ReadGIF()
/* if this is not an animated GIF, exit after first image */
if (!m_anim)
/* if this is not an animated GIF, exit after first image */
if (!m_anim)
- done =
TRUE
;
+ done =
true
;
}
}
}
}
@@
-906,8
+908,8
@@
int wxGIFDecoder::ReadGIF()
if ((buf[8] & 0x80) == 0x80)
{
ncolors = 2 << (buf[8] & 0x07);
if ((buf[8] & 0x80) == 0x80)
{
ncolors = 2 << (buf[8] & 0x07);
-
off_
t pos = m_f->TellI();
-
off_
t numBytes = 3 * ncolors;
+
wxFileOffse
t pos = m_f->TellI();
+
wxFileOffse
t numBytes = 3 * ncolors;
m_f->SeekI(numBytes, wxFromCurrent);
if (m_f->TellI() != (pos + numBytes))
{
m_f->SeekI(numBytes, wxFromCurrent);
if (m_f->TellI() != (pos + numBytes))
{