gosu 0.9.2 → 0.10.0

data/src/Bitmap/BitmapBMP.cpp

@@ -1,79 +0,0 @@
-#include <Gosu/Platform.hpp>
-
-// All other platforms use OS libraries instead.
-#ifdef GOSU_IS_IPHONE
-#include <Gosu/Bitmap.hpp>
-#include <Gosu/IO.hpp>
-#include <Gosu/TR1.hpp>
-
-namespace
-{
-    template<unsigned bits> struct UintSelector;
-    template<> struct UintSelector<8>  { typedef std::tr1::uint8_t  Type; };
-    template<> struct UintSelector<16> { typedef std::tr1::uint16_t Type; };
-    template<> struct UintSelector<32> { typedef std::tr1::uint32_t Type; };
-    
-    template<unsigned bits, typename T>
-    void writeVal(Gosu::Writer& writer, T value)
-    {
-        typename UintSelector<bits>::Type val = value;
-        writer.writePod(val, Gosu::boLittle);
-    }
-}
-
-Gosu::Writer Gosu::saveToBMP(const Bitmap& bmp, Writer writer)
-{
-    // rowSize is the width ceiled to the next multiple of four.
-    unsigned rowSize = bmp.width() * 3;
-    rowSize = int((float(rowSize) - 1.0)/4.0 + 1.0) * 4;
-    
-    // File header
-    // Type
-    writeVal<8>(writer, 'B');
-    writeVal<8>(writer, 'M');
-    // Size
-    writeVal<32>(writer, 14 + 40 + rowSize * bmp.height());
-    // Reserved
-    writeVal<16>(writer, 0);
-    writeVal<16>(writer, 0);
-    // Offset to data
-    writeVal<32>(writer, 14 + 40);
-        
-    // Info header
-    // Size
-    writeVal<32>(writer, 40);
-    // Width, height
-    writeVal<32>(writer, bmp.width());
-    writeVal<32>(writer, bmp.height());
-    // Planes
-    writeVal<16>(writer, 1);
-    // Bit count
-    writeVal<16>(writer, 24);
-    // Compression
-    writeVal<32>(writer, 0);
-    // Image size
-    writeVal<32>(writer, rowSize * bmp.height());
-    // xPelsPerMeter/yPelsPerMeter
-    writeVal<32>(writer, 0);
-    writeVal<32>(writer, 0);
-    // Used and important colors
-    writeVal<32>(writer, 0);
-    writeVal<32>(writer, 0);
-        
-    for (int y = bmp.height() - 1; y >= 0; y--)
-    {
-        for (unsigned x = 0; x < bmp.width(); x++)
-        {
-            // BGR order
-            writeVal<8>(writer, bmp.getPixel(x, y).blue());
-            writeVal<8>(writer, bmp.getPixel(x, y).green());
-            writeVal<8>(writer, bmp.getPixel(x, y).red());
-        }
-        int offset = rowSize - bmp.width() * 3;
-        for(int i = 0; i < offset; ++i)
-            writeVal<8>(writer, 0);
-    }
-    return writer;
-}
-
-#endif

data/src/Bitmap/BitmapColorKey.cpp

@@ -1,50 +0,0 @@
-#include <Gosu/Bitmap.hpp>
-#include <vector>
-
-void Gosu::applyColorKey(Bitmap& bitmap, Color key)
-{
-    std::vector<Color> surroundingColors;
-    surroundingColors.reserve(4);
-
-    for (unsigned y = 0; y < bitmap.height(); ++y)
-        for (unsigned x = 0; x < bitmap.width(); ++x)
-            if (bitmap.getPixel(x, y) == key)
-            {
-                surroundingColors.clear();
-                if (x > 0 && bitmap.getPixel(x - 1, y) != key)
-                    surroundingColors.push_back(bitmap.getPixel(x - 1, y));
-                if (x < bitmap.width() - 1 && bitmap.getPixel(x + 1, y) != key)
-                    surroundingColors.push_back(bitmap.getPixel(x + 1, y));
-                if (y > 0 && bitmap.getPixel(x, y - 1) != key)
-                    surroundingColors.push_back(bitmap.getPixel(x, y - 1));
-                if (y < bitmap.height() - 1 && bitmap.getPixel(x, y + 1) != key)
-                    surroundingColors.push_back(bitmap.getPixel(x, y + 1));
-
-                if (surroundingColors.empty())
-                {
-                    bitmap.setPixel(x, y, Color::NONE);
-                    continue;
-                }
-
-                unsigned red = 0, green = 0, blue = 0;
-                for (unsigned i = 0; i < surroundingColors.size(); ++i)
-                {
-                    red += surroundingColors[i].red();
-                    green += surroundingColors[i].green();
-                    blue += surroundingColors[i].blue();
-                }
-                bitmap.setPixel(x, y, Color(0, red / surroundingColors.size(),
-                    green / surroundingColors.size(), blue / surroundingColors.size()));
-            }
-}
-
-void Gosu::unapplyColorKey(Bitmap& bitmap, Color color)
-{
-    Color* p = bitmap.data();
-    for (int i = bitmap.width() * bitmap.height(); i > 0; --i, ++p)
-        if (p->alpha() == 0)
-            *p = color;
-        else
-            p->setAlpha(255);
-}
-

data/src/Bitmap/BitmapFreeImage.cpp

@@ -1,174 +0,0 @@
-#include <Gosu/Bitmap.hpp>
-#include <Gosu/IO.hpp>
-#include <Gosu/Platform.hpp>
-#include <Gosu/TR1.hpp>
-#include <Gosu/Utility.hpp>
-#include <stdexcept>
-#include <vector>
-#include <FreeImage.h>
-
-// Compatibility with FreeImage <3.1.3. Subtly changes Gosu's behavior though.
-#ifndef JPEG_EXIFROTATE
-#define JPEG_EXIFROTATE 0
-#endif
-
-// With MSVC, add a suffix so FreeImage can be linked as a fallback for GDI+.
-// With MinGW, Gosu uses FreeImage all the time, so no suffix is needed.
-#ifdef _MSC_VER
-#define FI(x) x##_FreeImage
-#else
-#define FI(x) x
-#endif
-
-namespace
-{
-    const int GOSU_FIFLAGS = (JPEG_EXIFROTATE | ICO_MAKEALPHA | PNG_IGNOREGAMMA);
-    
-    void reshuffleBitmap(Gosu::Bitmap& bitmap)
-    {
-        // Since FreeImage gracefully ignores the MASK parameters above, we
-        // manually exchange the R and B channels.
-        std::tr1::uint32_t* p = reinterpret_cast<std::tr1::uint32_t*>(bitmap.data());
-        for (int i = bitmap.width() * bitmap.height(); i > 0; --i, ++p)
-            *p = (*p & 0xff00ff00) | ((*p << 16) & 0x00ff0000) | ((*p >> 16) & 0x000000ff);
-    }
-
-    FIBITMAP* ensure32bits(FIBITMAP* fib)
-    {
-        int bpp = FreeImage_GetBPP(fib);
-        FREE_IMAGE_TYPE image_type = FreeImage_GetImageType(fib);
-        if (bpp != 32 && (image_type == FIT_BITMAP || image_type == FIT_RGBA16)) {
-            FIBITMAP* fib32 = FreeImage_ConvertTo32Bits(fib);
-            FreeImage_Unload(fib);
-            fib = fib32;
-        }
-        return fib;
-    }
-    
-    void fibToBitmap(Gosu::Bitmap& bitmap, FIBITMAP* fib, FREE_IMAGE_FORMAT fif)
-    {
-        bitmap.resize(FreeImage_GetWidth(fib), FreeImage_GetHeight(fib));
-        fib = ensure32bits(fib);
-        FreeImage_ConvertToRawBits(reinterpret_cast<BYTE*>(bitmap.data()),
-            fib, bitmap.width() * 4, 32,
-            FI_RGBA_RED_MASK, FI_RGBA_GREEN_MASK, FI_RGBA_BLUE_MASK, TRUE);
-        FreeImage_Unload(fib);
-        reshuffleBitmap(bitmap);
-        if (fif == FIF_BMP)
-            Gosu::applyColorKey(bitmap, Gosu::Color::FUCHSIA);
-    }
-    
-    FIBITMAP* bitmapToFIB(Gosu::Bitmap bitmap, FREE_IMAGE_FORMAT fif)
-    {
-        reshuffleBitmap(bitmap);
-        if (fif == FIF_BMP)
-            unapplyColorKey(bitmap, Gosu::Color::FUCHSIA);
-        return FreeImage_ConvertFromRawBits((BYTE*)bitmap.data(),
-            bitmap.width(), bitmap.height(), bitmap.width() * 4, 32,
-            FI_RGBA_RED_MASK, FI_RGBA_GREEN_MASK, FI_RGBA_BLUE_MASK, true);
-    }
-    
-    // Wrap Gosu::Writer as a FreeImageIO.
-    unsigned DLL_CALLCONV WriteProc(void *buffer, unsigned size, unsigned count, fi_handle handle)
-    {
-        ((Gosu::Writer*)handle)->write(buffer, size * count);
-        return count;
-    }
-    int DLL_CALLCONV SeekProc(fi_handle handle, long offset, int origin)
-    {
-        Gosu::Writer& writer = *(Gosu::Writer*)handle;
-        switch (origin)
-        {
-        case SEEK_SET: writer.setPosition(offset); break;
-        case SEEK_CUR: writer.seek(offset); break;
-        case SEEK_END: writer.setPosition(writer.resource().size() - offset); break;
-        };
-        return 0;
-    }
-    long DLL_CALLCONV TellProc(fi_handle handle)
-    {
-        return ((Gosu::Writer*)handle)->position();
-    }
-    
-    // TODO: This is not thread safe!
-    
-    std::string lastFreeImageError;
-    
-    void DLL_CALLCONV FreeImageErrorHandler(FREE_IMAGE_FORMAT fif, const char *message)
-    {
-        lastFreeImageError = (message && message[0]) ? message : "Unknown error";
-        if (fif != FIF_UNKNOWN)
-            if (const char* format = FreeImage_GetFormatFromFIF(fif))
-                lastFreeImageError += std::string(" (in ") + format + " parser)";
-    }
-    
-    void checkForFreeImageErrors(bool value = true)
-    {
-        if (!value || !lastFreeImageError.empty())
-        {
-            std::string message = lastFreeImageError;
-            if (message.empty())
-                message = "Unknown error";
-            else
-                lastFreeImageError.clear();
-            throw std::runtime_error(message);
-        }
-    }
-}
-
-namespace Gosu
-{
-    void FI(loadImageFile)(Bitmap& bitmap, const std::wstring& filename)
-    {
-        #ifdef GOSU_IS_WIN
-        FREE_IMAGE_FORMAT fif = FreeImage_GetFileTypeU(filename.c_str());
-        FIBITMAP* fib = FreeImage_LoadU(fif, filename.c_str(), GOSU_FIFLAGS);
-        #else
-        std::string utf8Filename = wstringToUTF8(filename);
-        FREE_IMAGE_FORMAT fif = FreeImage_GetFileType(utf8Filename.c_str());
-        FIBITMAP* fib = FreeImage_Load(fif, utf8Filename.c_str(), GOSU_FIFLAGS);
-        #endif
-        checkForFreeImageErrors(fib != 0);
-        fibToBitmap(bitmap, fib, fif);
-    }
-
-    void FI(loadImageFile)(Bitmap& bitmap, Gosu::Reader input)
-    {
-        // Read all available input
-        std::vector<BYTE> data(input.resource().size() - input.position());
-        input.read(&data[0], data.size());
-        FIMEMORY* fim = FreeImage_OpenMemory(&data[0], data.size());
-        FREE_IMAGE_FORMAT fif = FreeImage_GetFileTypeFromMemory(fim);
-        FIBITMAP* fib = FreeImage_LoadFromMemory(fif, fim, GOSU_FIFLAGS);
-        checkForFreeImageErrors(fib != 0);
-        fibToBitmap(bitmap, fib, fif);
-    }
-
-    void FI(saveImageFile)(const Bitmap& bitmap, const std::wstring& filename)
-    {
-        std::string utf8Filename = wstringToUTF8(filename);
-        FREE_IMAGE_FORMAT fif = FreeImage_GetFIFFromFilename(utf8Filename.c_str());
-        FIBITMAP* fib = bitmapToFIB(bitmap, fif);
-
-        #ifdef GOSU_IS_WIN
-        FreeImage_SaveU(fif, fib, filename.c_str());
-        #else
-        FreeImage_Save(fif, fib, utf8Filename.c_str());
-        #endif
-        FreeImage_Unload(fib);
-        checkForFreeImageErrors();
-    }
-
-    void FI(saveImageFile)(const Bitmap& bitmap, Gosu::Writer writer,
-        const std::wstring& formatHint)
-    {
-        std::string utf8FormatHint = wstringToUTF8(formatHint);
-        FREE_IMAGE_FORMAT fif = FreeImage_GetFIFFromFilename(utf8FormatHint.c_str());
-        FIBITMAP* fib = bitmapToFIB(bitmap, fif);
-        
-        FreeImageIO fio = { NULL, WriteProc, SeekProc, TellProc };
-        FreeImage_SaveToHandle(fif, fib, &fio, &writer);
-        FreeImage_Unload(fib);
-        checkForFreeImageErrors();
-    }
-}

data/src/Bitmap/BitmapGDIplus.cpp

@@ -1,212 +0,0 @@
-#include <Gosu/Graphics.hpp>
-#include <Gosu/Bitmap.hpp>
-#include <Gosu/IO.hpp>
-#include <Gosu/Platform.hpp>
-#include <Gosu/TR1.hpp>
-#include <Gosu/Utility.hpp>
-#include <Gosu/WinUtility.hpp>
-#include <cwctype>
-#include <map>
-
-#include <objidl.h>
-#include <gdiplus.h>
-#include <windows.h>
-
-using namespace std;
-
-// TODO: Move into proper internal header
-namespace Gosu { bool isExtension(const wchar_t* str, const wchar_t* ext); }
-
-namespace
-{
-    bool initialized = false;
-    ULONG_PTR token;
-    Gdiplus::GdiplusStartupInput input;
-
-    // TODO: Merge with BitmapFreeImage.cpp, somehow
-    void reshuffleBitmap(Gosu::Bitmap& bitmap)
-    {
-        // Since GDI+ only supports ARGB=BGRA formats, we
-        // manually exchange the R and B channels to get to ABGR=RGBA.
-        std::tr1::uint32_t* p = reinterpret_cast<std::tr1::uint32_t*>(bitmap.data());
-        for (int i = bitmap.width() * bitmap.height(); i > 0; --i, ++p)
-            *p = (*p & 0xff00ff00) | ((*p << 16) & 0x00ff0000) | ((*p >> 16) & 0x000000ff);
-    }    
-
-    void check(Gdiplus::Status status, const char* action)
-    {
-        if (status != Gdiplus::Ok)
-            throw runtime_error(string("A GDI+ error occured while ") + action);
-    }
-
-    void closeGDIplus()
-    {
-        Gdiplus::GdiplusShutdown(token);
-    }
-
-    void requireGDIplus()
-    {
-        if (initialized)
-            return;
-        initialized = true;
-        check(Gdiplus::GdiplusStartup(&token, &input, NULL), "initializing GDI+");
-        atexit(closeGDIplus);
-    }
-
-    void gdiPlusToGosu(Gosu::Bitmap& result, Gdiplus::Bitmap& bitmap)
-    {
-        result.resize(bitmap.GetWidth(), bitmap.GetHeight());
-
-        GUID guid;
-        check(bitmap.GetRawFormat(&guid), "getting the format GUID");
-        // TODO:
-        // if (guid == Gdiplus::ImageFormatJPEG || guid == Gdiplus::ImageFormatPNG ||
-        //     guid == Gdiplus::ImageFormatGIF  || guid == Gdiplus::ImageFormatBMP ||
-        //     guid == Gdiplus::ImageFormatTIFF || guid == Gdiplus::ImageFormatIcon)
-        // else use FreeImage (via lazy linking...)
-
-        Gdiplus::BitmapData target;
-        target.Width = result.width();
-        target.Height = result.height();
-        target.PixelFormat = PixelFormat32bppARGB;
-        target.Stride = result.width() * 4;
-        target.Scan0 = result.data();
-
-        Gdiplus::Rect rect(0, 0, bitmap.GetWidth(), bitmap.GetHeight());
-
-        check(bitmap.LockBits(&rect,
-            Gdiplus::ImageLockModeRead | Gdiplus::ImageLockModeUserInputBuf,
-            PixelFormat32bppARGB, &target), "locking bits");
-        check(bitmap.UnlockBits(&target), "unlocking bits");
-        
-        reshuffleBitmap(result);
-                
-        if (guid == Gdiplus::ImageFormatBMP)
-            applyColorKey(result, Gosu::Color::FUCHSIA);
-    }
-
-    tr1::shared_ptr<IStream> readToIStream(Gosu::Reader reader)
-    {
-        unsigned remaining = reader.resource().size() - reader.position();
-        HGLOBAL buffer = ::GlobalAlloc(GMEM_MOVEABLE, remaining);
-        Gosu::Win::check(buffer);
-        void* bufferPtr = ::GlobalLock(buffer);
-        if (!bufferPtr)
-        {
-            ::GlobalFree(buffer);
-            Gosu::Win::throwLastError();
-        }
-        reader.read(bufferPtr, reader.resource().size() - reader.position());
-        
-        IStream* stream = NULL;
-        if (::CreateStreamOnHGlobal(buffer, TRUE, &stream) != S_OK)
-        {
-            ::GlobalFree(buffer);
-            throw runtime_error("Could not create IStream");
-        }
-        return Gosu::Win::shareComPtr(stream);
-    }
-    
-    CLSID& encoderFromMimeType(const wstring& mimeType)
-    {
-        static map<wstring, CLSID> cache;
-        if (cache.count(mimeType))
-            return cache[mimeType];
-
-        UINT num = 0, size = 0;
-        check(Gdiplus::GetImageEncodersSize(&num, &size), "counting encoders");
-        // Do the eleet int-based ceil(size / sizeof)
-        unsigned vecSize = (size + sizeof(Gdiplus::ImageCodecInfo) - 1) / sizeof(Gdiplus::ImageCodecInfo);
-        vector<Gdiplus::ImageCodecInfo> codecs(vecSize);
-        check(Gdiplus::GetImageEncoders(num, size,
-            &codecs[0]), "enumerating encoders");
-        for (int i = 0; i < num; ++i)
-            if (codecs[i].MimeType == mimeType)
-                return cache[mimeType] = codecs[i].Clsid;
-        throw runtime_error("No encoder found for " + Gosu::wstringToUTF8(mimeType));
-    }
-
-    CLSID encoderFromHint(const wstring& formatHint)
-    {
-        wstring::size_type idx = formatHint.rfind('.');
-        wstring mimeType = L"image/";
-        if (idx == wstring::npos)
-            mimeType += formatHint;
-        else
-            mimeType += formatHint.substr(idx + 1);
-            
-        for (int i = 0; i < mimeType.size(); ++i)
-            mimeType[i] = towlower((wint_t)mimeType[i]);
-        
-        // Fix pitfalls
-        if (mimeType == L"image/jpg")
-            mimeType = L"image/jpeg";
-        else if (mimeType == L"image/tif")
-            mimeType = L"image/tiff";
-        
-        return encoderFromMimeType(mimeType);
-    }
-}
-
-void Gosu::loadImageFile(Gosu::Bitmap& result, const wstring& filename)
-{
-    requireGDIplus();
-
-    Gdiplus::Bitmap bitmap(filename.c_str());
-    check(bitmap.GetLastStatus(), ("loading " + wstringToUTF8(filename)).c_str());
-    gdiPlusToGosu(result, bitmap);
-}
-
-void Gosu::loadImageFile(Gosu::Bitmap& result, Reader reader)
-{
-    requireGDIplus();
-
-    tr1::shared_ptr<IStream> stream = readToIStream(reader);
-    Gdiplus::Bitmap bitmap(stream.get());
-    check(bitmap.GetLastStatus(), "loading a bitmap from memory");
-    gdiPlusToGosu(result, bitmap);
-}
-
-void Gosu::saveImageFile(const Bitmap& bitmap, const wstring& filename)
-{
-    requireGDIplus();
-
-    Bitmap input = bitmap;
-    if (isExtension(filename.c_str(), L".bmp"))
-        unapplyColorKey(input, Color::FUCHSIA);
-    reshuffleBitmap(input);
-    Gdiplus::Bitmap output(input.width(), input.height(), input.width() * 4,
-        PixelFormat32bppARGB, (BYTE*)input.data());
-    check(output.GetLastStatus(), "creating a bitmap in memory");
-
-    check(output.Save(filename.c_str(), &encoderFromHint(filename)),
-        ("writing to " + wstringToUTF8(filename)).c_str());
-}
-
-void Gosu::saveImageFile(const Bitmap& bitmap, Writer writer, const wstring& formatHint)
-{
-    requireGDIplus();
-
-    Bitmap input = bitmap;
-    if (isExtension(formatHint.c_str(), L".bmp"))
-        unapplyColorKey(input, Color::FUCHSIA);
-    reshuffleBitmap(input);
-    Gdiplus::Bitmap output(input.width(), input.height(), input.width() * 4,
-        PixelFormat32bppARGB, (BYTE*)input.data());
-    check(output.GetLastStatus(), "creating a bitmap in memory");
-    
-    IStream* stream = NULL;
-    if (CreateStreamOnHGlobal(0, TRUE, &stream) != S_OK)
-        throw runtime_error("Could not create IStream for writing");
-    tr1::shared_ptr<IStream> streamGuard(Gosu::Win::shareComPtr(stream));
-    check(output.Save(stream, &encoderFromHint(formatHint)),
-        "saving a bitmap to memory");
-
-    HGLOBAL buffer;
-    GetHGlobalFromStream(stream, &buffer);
-    void* bufferPtr = GlobalLock(buffer);
-    if (!bufferPtr)
-        Win::throwLastError();
-    writer.write(bufferPtr, GlobalSize(buffer));
-    GlobalUnlock(buffer);
-}