Fixed bug preventing PNGTranslator from opening PNG images, fixed version number text in config panel
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@6840 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -294,6 +294,9 @@ status_t
|
|||||||
PNGTranslator::translate_from_png_to_bits(BPositionIO *inSource,
|
PNGTranslator::translate_from_png_to_bits(BPositionIO *inSource,
|
||||||
BPositionIO *outDestination)
|
BPositionIO *outDestination)
|
||||||
{
|
{
|
||||||
|
if (identify_png_header(inSource, NULL) != B_OK)
|
||||||
|
return B_NO_TRANSLATOR;
|
||||||
|
|
||||||
status_t result = B_ERROR;
|
status_t result = B_ERROR;
|
||||||
// if a libpng errors before this is set
|
// if a libpng errors before this is set
|
||||||
// to a different value, the above is what
|
// to a different value, the above is what
|
||||||
@@ -489,7 +492,6 @@ PNGTranslator::translate_from_png(BPositionIO *inSource, uint32 outType,
|
|||||||
else {
|
else {
|
||||||
// Translate from PNG to PNG
|
// Translate from PNG to PNG
|
||||||
translate_direct_copy(inSource, outDestination);
|
translate_direct_copy(inSource, outDestination);
|
||||||
|
|
||||||
return B_OK;
|
return B_OK;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -153,8 +153,8 @@ PNGView::Draw(BRect area)
|
|||||||
char detail[100];
|
char detail[100];
|
||||||
sprintf(detail, "Version %d.%d.%d %s",
|
sprintf(detail, "Version %d.%d.%d %s",
|
||||||
static_cast<int>(B_TRANSLATION_MAJOR_VER(PNG_TRANSLATOR_VERSION)),
|
static_cast<int>(B_TRANSLATION_MAJOR_VER(PNG_TRANSLATOR_VERSION)),
|
||||||
static_cast<int>(B_TRANSLATION_MAJOR_VER(PNG_TRANSLATOR_VERSION)),
|
static_cast<int>(B_TRANSLATION_MINOR_VER(PNG_TRANSLATOR_VERSION)),
|
||||||
static_cast<int>(B_TRANSLATION_MAJOR_VER(PNG_TRANSLATOR_VERSION)),
|
static_cast<int>(B_TRANSLATION_REVSN_VER(PNG_TRANSLATOR_VERSION)),
|
||||||
__DATE__);
|
__DATE__);
|
||||||
DrawString(detail, BPoint(xbold, yplain + ybold));
|
DrawString(detail, BPoint(xbold, yplain + ybold));
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user