From caff577d6a3b77e65bb97012f2ff8f1c069d05a8 Mon Sep 17 00:00:00 2001 From: Matthew Wilber Date: Thu, 8 Jan 2004 03:47:09 +0000 Subject: [PATCH] Fixed version format and calculations git-svn-id: file:///srv/svn/repos/haiku/trunk/current@5986 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/translators/pngtranslator/PNGTranslator.cpp | 5 +++-- src/add-ons/translators/pngtranslator/PNGTranslator.h | 2 +- src/add-ons/translators/pngtranslator/PNGView.cpp | 5 +++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/add-ons/translators/pngtranslator/PNGTranslator.cpp b/src/add-ons/translators/pngtranslator/PNGTranslator.cpp index bd4122e88a..d02059e087 100644 --- a/src/add-ons/translators/pngtranslator/PNGTranslator.cpp +++ b/src/add-ons/translators/pngtranslator/PNGTranslator.cpp @@ -181,8 +181,9 @@ PNGTranslator::PNGTranslator() strcpy(fName, "PNG Images"); sprintf(fInfo, "PNG image translator v%d.%d.%d %s", - PNG_TRANSLATOR_VERSION / 100, (PNG_TRANSLATOR_VERSION / 10) % 10, - PNG_TRANSLATOR_VERSION % 10, __DATE__); + static_cast(PNG_TRANSLATOR_VERSION >> 8), + static_cast((PNG_TRANSLATOR_VERSION >> 4) & 0xf), + static_cast(PNG_TRANSLATOR_VERSION & 0xf), __DATE__); } // --------------------------------------------------------------- diff --git a/src/add-ons/translators/pngtranslator/PNGTranslator.h b/src/add-ons/translators/pngtranslator/PNGTranslator.h index fe2af4a202..b4621bac93 100644 --- a/src/add-ons/translators/pngtranslator/PNGTranslator.h +++ b/src/add-ons/translators/pngtranslator/PNGTranslator.h @@ -45,7 +45,7 @@ // IO Extension Names: -#define PNG_TRANSLATOR_VERSION 100 +#define PNG_TRANSLATOR_VERSION 0x100 #define PNG_IN_QUALITY 0.6 #define PNG_IN_CAPABILITY 0.2 diff --git a/src/add-ons/translators/pngtranslator/PNGView.cpp b/src/add-ons/translators/pngtranslator/PNGView.cpp index 12dc900945..5bea55bb3c 100644 --- a/src/add-ons/translators/pngtranslator/PNGView.cpp +++ b/src/add-ons/translators/pngtranslator/PNGView.cpp @@ -152,8 +152,9 @@ PNGView::Draw(BRect area) char detail[100]; sprintf(detail, "Version %d.%d.%d %s", - PNG_TRANSLATOR_VERSION / 100, (PNG_TRANSLATOR_VERSION / 10) % 10, - PNG_TRANSLATOR_VERSION % 10, __DATE__); + static_cast(PNG_TRANSLATOR_VERSION >> 8), + static_cast((PNG_TRANSLATOR_VERSION >> 4) & 0xf), + static_cast(PNG_TRANSLATOR_VERSION & 0xf), __DATE__); DrawString(detail, BPoint(xbold, yplain + ybold)); int32 lineno = 6;