Changeset 963


Ignore:
Timestamp:
Sep 19, 2011, 2:07:41 AM (11 years ago)
Author:
sam
Message:

build: fix PS3 and Android build; it was broken since the ImageData refactor.

Location:
trunk/src
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/core.h

    r940 r963  
    4848/* Ensure isnan() is present even on systems that don't define it, or
    4949 * when -ffast-math is being used. */
     50#include <cmath>
    5051#if defined __FAST_MATH__
    5152#   undef isnan
  • trunk/src/image/codec/android-image.cpp

    r962 r963  
    9696        pixels[n] = u;
    9797    }
    98     format = FORMAT_RGBA;
     98    format = Image::FORMAT_RGBA;
    9999
    100100    return true;
  • trunk/src/image/codec/ps3-image.cpp

    r962 r963  
    7979    in_param.ppuThreadPriority = 1000;
    8080    in_param.spuThreadPriority = 200;
    81     in_param.cbCtrlMallocFunc = ImageData::Malloc;
     81    in_param.cbCtrlMallocFunc = Ps3ImageData::Malloc;
    8282    in_param.cbCtrlMallocArg = NULL;
    83     in_param.cbCtrlFreeFunc = ImageData::Free;
     83    in_param.cbCtrlFreeFunc = Ps3ImageData::Free;
    8484    in_param.cbCtrlFreeArg = NULL;
    8585    CellPngDecThreadOutParam out_param;
     
    147147    /* Decode image */
    148148    size = ivec2(info.imageWidth, info.imageHeight);
    149     format = FORMAT_RGBA;
     149    format = Image::FORMAT_RGBA;
    150150    pixels = (uint8_t *)malloc(info.imageWidth * 4 * info.imageHeight);
    151151    CellPngDecDataCtrlParam data_ctrl_param;
  • trunk/src/image/image-private.h

    r955 r963  
    7676
    7777public:
     78    virtual ~ImageData() {}
     79
    7880    virtual bool Open(char const *) = 0;
    7981    virtual bool Close() = 0;
     
    8486    ivec2 size;
    8587    Image::format_t format;
    86 
    87 private:
    8888};
    8989
Note: See TracChangeset for help on using the changeset viewer.