From 4ddf2cde32f9234ce8bd395d00edebd1c8ca98e8 Mon Sep 17 00:00:00 2001 From: Marten Richter Date: Tue, 9 Oct 2012 08:35:14 +0200 Subject: [PATCH] MVp compile fixes supplied by sirwio --- GNUmakefile | 2 +- defines.h | 3 +++ osdmvp.cc | 6 +++--- surface.h | 1 + surfacemvp.h | 2 +- vcolourtuner.cc | 39 ++++++++++++++++++++++----------------- vcolourtuner.h | 4 ++-- vmedialist.cc | 16 ++++++++-------- vmediaview.cc | 48 ++++++++++++++++++++++++------------------------ vmediaview.h | 9 +++++---- wjpeg.h | 8 ++++---- wjpegcomplex.cc | 22 +++++++++++----------- wjpegcomplex.h | 2 +- 13 files changed, 86 insertions(+), 76 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index 5b124af..cc09c00 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -45,7 +45,7 @@ $(info MVP flags) LDFLAGS = -Wall -static LIBS = -lpthread -lrt -OBJECTS += wwss.o main.o threadp.o remotemvp.o ledmvp.o mtdmvp.o videomvp.o audiomvp.o osdmvp.o surfacemvp.o vmedialist.o vcolourtuner.o vmediaview.o vvideomedia.o mediafile.o +OBJECTS += wwss.o main.o threadp.o remotemvp.o ledmvp.o mtdmvp.o videomvp.o audiomvp.o osdmvp.o surfacemvp.o wjpegcomplex.o vmedialist.o vcolourtuner.o vmediaview.o vvideomedia.o mediafile.o TIOBJECT = ticonfig.o CROSSLIBS = ../jpeg/jpeg-6b/libjpeg.a INCLUDES = -I../jpeg/jpeg-6b -DVOMP_PLATTFORM_MVP diff --git a/defines.h b/defines.h index 1bbdec6..24c1bf0 100644 --- a/defines.h +++ b/defines.h @@ -126,10 +126,12 @@ long long getTimeMS(); #define OsdStartDev "/dev/stbgfx" #define Audio_TYPE AudioMVP #define Video_TYPE VideoMVP + #define Surface_TYPE SurfaceMVP //deprecated #define DEFAULT_TCP_WINDOWSIZENR 1 /*=2048*/ #define PAL_WSS #define MVP_REMOTE_TYPES + #define VOMP_MEDIAPLAYER #define VOMP_LINUX_CLOCK CLOCK_REALTIME #endif @@ -142,6 +144,7 @@ long long getTimeMS(); #define OsdStartDev "" #define Audio_TYPE AudioNMT #define Video_TYPE VideoNMT + #define Surface_TYPE SurfaceDirectFB //deprecated #define DEFAULT_TCP_WINDOWSIZENR 1 /*=2048*/ #define VOMP_LINUX_CLOCK CLOCK_REALTIME diff --git a/osdmvp.cc b/osdmvp.cc index 0317ea2..476045d 100644 --- a/osdmvp.cc +++ b/osdmvp.cc @@ -37,11 +37,11 @@ int OsdMVP::getFD() return fdOsd; } -Surface * OsdMvp::createNewSurface();{ - return (Surface*)new SurfaceMVP(); +Surface * OsdMVP::createNewSurface() +{ + return (Surface*)new SurfaceMVP(); } - int OsdMVP::init(void* device) { if (initted) return 0; diff --git a/surface.h b/surface.h index f970f4d..83afa52 100644 --- a/surface.h +++ b/surface.h @@ -51,6 +51,7 @@ class Surface { friend class Wwss; // classes that need surface access, their usage is forbidden for vector based friend class WJpegComplex;// implementations of osd + friend class VColourTuner; public: Surface(int id = 0); virtual ~Surface(); diff --git a/surfacemvp.h b/surfacemvp.h index 02db48b..12c7c88 100644 --- a/surfacemvp.h +++ b/surfacemvp.h @@ -164,7 +164,7 @@ class SurfaceMVP : public Surface void drawHorzLine(int x1, int x2, int y, const DrawStyle& c); void drawVertLine(int x, int y1, int y2, const DrawStyle& c); - void drawBitmap(int x, int y, const Bitmap& bm); + void drawBitmap(int x, int y, const Bitmap& bm, const DisplayRegion& region); int updateToScreen(int sx, int sy, int w, int h, int dx, int dy); void readPixel(int x, int y, unsigned char* r, unsigned char* g, unsigned char* b); void screenShot(const char* fileName); diff --git a/vcolourtuner.cc b/vcolourtuner.cc index d79f7fd..73dfef7 100644 --- a/vcolourtuner.cc +++ b/vcolourtuner.cc @@ -29,6 +29,11 @@ #include "i18n.h" #include "log.h" #include "mediaoptions.h" + +#ifdef VOMP_PLATTFORM_MVP +#include "surfacemvp.h" +#endif + #define PICTUREFILE "/colourtest.jpg" @@ -78,28 +83,28 @@ void VColourTuner::draw() int bw=50; int bh=50; int picx=picture.getX(); - Colour bc=Colour(140,140,140); + DrawStyle bc=DrawStyle(140,140,140); fillColour(bc); - bc=Colour(255,255,255); - drawText(tr("Colour Tuning"), x+20, y+5, Colour::LIGHTTEXT); - drawBox(x, y+50, bw, bh, Colour::RED); - drawBox(x, y+130, bw, bh, Colour::GREEN); - drawBox(x, y+190, bw, bh, Colour::BLUE); + bc=DrawStyle(255,255,255); + drawText(tr("Colour Tuning"), x+20, y+5, DrawStyle::LIGHTTEXT); + drawBox(x, y+50, bw, bh, DrawStyle::RED); + drawBox(x, y+130, bw, bh, DrawStyle::GREEN); + drawBox(x, y+190, bw, bh, DrawStyle::BLUE); drawBox(x, y+270, bw, bh, bc); sprintf(valbuf,"%03d%%",vrfactor); - drawText(valbuf,x+bw+x,y+50, Colour::LIGHTTEXT); - drawText("<1 2>",x+bw+x,y+74, Colour::LIGHTTEXT); + drawText(valbuf,x+bw+x,y+50, DrawStyle::LIGHTTEXT); + drawText("<1 2>",x+bw+x,y+74, DrawStyle::LIGHTTEXT); sprintf(valbuf,"%03d%%",vgfactor); - drawText(valbuf,x+bw+x,y+120, Colour::LIGHTTEXT); - drawText("<4 5>",x+bw+x,y+144, Colour::LIGHTTEXT); + drawText(valbuf,x+bw+x,y+120, DrawStyle::LIGHTTEXT); + drawText("<4 5>",x+bw+x,y+144, DrawStyle::LIGHTTEXT); sprintf(valbuf,"%03d%%",vbfactor); - drawText(valbuf,x+bw+x,y+190, Colour::LIGHTTEXT); - drawText("<7 8>",x+bw+x,y+214, Colour::LIGHTTEXT); + drawText(valbuf,x+bw+x,y+190, DrawStyle::LIGHTTEXT); + drawText("<7 8>",x+bw+x,y+214, DrawStyle::LIGHTTEXT); sprintf(valbuf,"%03d%%",(vbfactor+vgfactor+vrfactor)/3); - drawText(valbuf,x+bw+x,y+270, Colour::LIGHTTEXT); - drawText("<3 6>",x+bw+x,y+294, Colour::LIGHTTEXT); - drawText("9 norm",x+bw+x,y+318, Colour::LIGHTTEXT); - drawText(tr("OK to save, BACK to cancel"), x+20, area.h - 50, Colour::LIGHTTEXT); + drawText(valbuf,x+bw+x,y+270, DrawStyle::LIGHTTEXT); + drawText("<3 6>",x+bw+x,y+294, DrawStyle::LIGHTTEXT); + drawText("9 norm",x+bw+x,y+318, DrawStyle::LIGHTTEXT); + drawText(tr("OK to save, BACK to cancel"), x+20, area.h - 50, DrawStyle::LIGHTTEXT); if (drawPicture) { hasChanged=false; picture.init(PICTUREFILE); @@ -108,7 +113,7 @@ void VColourTuner::draw() } int picy=picture.getY(); int pich=picture.getHeight(); - if (hasChanged) drawText(tr("0 to draw picture"), picx+30, picy+pich+10, Colour::LIGHTTEXT); + if (hasChanged) drawText(tr("0 to draw picture"), picx+30, picy+pich+10, DrawStyle::LIGHTTEXT); } int VColourTuner::handleCommand(int command) diff --git a/vcolourtuner.h b/vcolourtuner.h index 108563e..c816cca 100644 --- a/vcolourtuner.h +++ b/vcolourtuner.h @@ -47,7 +47,7 @@ class VColourTuner : public TBBoxx //amount in +/- % void updateFactor(int color, int amount); //draw a box with the picture drawing function - void drawBox(int x, int y, int w, int h, Colour &c); + void drawBox(int x, int y, int w, int h, DrawStyle &c); static int rfactor; static int bfactor; static int gfactor; @@ -56,7 +56,7 @@ class VColourTuner : public TBBoxx int vgfactor; bool drawPicture; bool hasChanged; - WJpeg picture; + WJpegTYPE picture; }; diff --git a/vmedialist.cc b/vmedialist.cc index 08479c8..d454612 100644 --- a/vmedialist.cc +++ b/vmedialist.cc @@ -330,7 +330,7 @@ VMediaList::VMediaList() setPosition(70, 35); setTitleBarOn(1); - setTitleBarColour(Colour::TITLEBARBACKGROUND); + setTitleBarColour(DrawStyle::TITLEBARBACKGROUND); sl.setPosition(10, 30 + 5); sl.setSize(area.w - 20, area.h - 30 - 15 - 30); @@ -510,7 +510,7 @@ void VMediaList::draw() { sl.setVisible(false); TBBoxx::draw(); - drawText(tr("Loading..."), 240, 180, Colour::LIGHTTEXT); + drawText(tr("Loading..."), 240, 180, DrawStyle::LIGHTTEXT); } else { @@ -571,13 +571,13 @@ void VMediaList::doShowingBar() // Box b; // b.setSurfaceOffset(220, 385); // b.setDimensions(160, 25); -// b.fillColour(Colour::VIEWBACKGROUND); -// b.drawText(showing, 0, 0, Colour::LIGHTTEXT); +// b.fillColour(DrawStyle::VIEWBACKGROUND); +// b.drawText(showing, 0, 0, DrawStyle::LIGHTTEXT); - rectangle(200, 384, 18, 16, Colour::VIDEOBLUE); - rectangle(220, 385, 220+160, 385+25, Colour::VIEWBACKGROUND); - drawText(strmode, 220, 385, Colour::LIGHTTEXT); - drawText(showing, 280, 385, Colour::LIGHTTEXT); + rectangle(200, 384, 18, 16, DrawStyle::VIDEOBLUE); + rectangle(220, 385, 220+160, 385+25, DrawStyle::VIEWBACKGROUND); + drawText(strmode, 220, 385, DrawStyle::LIGHTTEXT); + drawText(showing, 280, 385, DrawStyle::LIGHTTEXT); if (sl.getCurrentOptionData() != 0) Log::getInstance()->log("VMediaList",Log::DEBUG,"selected %s",((Media *)sl.getCurrentOptionData())->getDisplayName()); } diff --git a/vmediaview.cc b/vmediaview.cc index 521f7af..33e4432 100644 --- a/vmediaview.cc +++ b/vmediaview.cc @@ -107,9 +107,9 @@ const int VMediaView::EVENT_DIRECTORYDONE=103; #define DRAWING_THREAD -Colour VMediaView::pictureBack=Colour(140,140,140); -Colour VMediaView::infoBack=Colour(110,110,110); -Colour VMediaView::audioBannerBack=Colour(110,110,110,20); +DrawStyle VMediaView::pictureBack=DrawStyle(140,140,140); +DrawStyle VMediaView::infoBack=DrawStyle(110,110,110); +DrawStyle VMediaView::audioBannerBack=DrawStyle(110,110,110,20); //the jpeg reader //how long do we wait for a single picture chunk @@ -174,7 +174,7 @@ class DrawingThread : public Thread_TYPE { VPreader * _reader; WJpegComplex::JpegControl *_ctl; Surface *_sfc; - Colour _colour; + DrawStyle _colour; bool _interrupted; public: DrawingThread(VMediaView *parent) { @@ -188,7 +188,7 @@ class DrawingThread : public Thread_TYPE { bool isRunning() { return (threadIsActive()!=0); } - bool start(WJpeg::JpegControl *ctl,Surface *sfc,VPreader *reader,Colour &c) { + bool start(WJpegComplex::JpegControl *ctl,Surface *sfc,VPreader *reader,DrawStyle &c) { if (isRunning()) { return false; } @@ -213,7 +213,7 @@ class DrawingThread : public Thread_TYPE { protected: virtual void threadMethod() { Log::getInstance()->log("DrawingThread",Log::DEBUG,"started"); - bool rt=WJpeg::drawJpeg(_ctl,_sfc,_reader,_colour); + bool rt=WJpegComplex::drawJpeg(_ctl,_sfc,_reader,_colour); _reader=NULL; if (! _interrupted) { Message* m = new Message(); @@ -420,9 +420,9 @@ void VMediaView::draw() Log::getInstance()->log("VMediaView::draw", Log::DEBUG, "pictureError=%s,p=%p", pictureError,this); if (pictureShowing ) fillColour(pictureBack); - else fillColour(Colour::BLACK); + else fillColour(DrawStyle::BLACK); if (pictureError) { - drawText(pictureError,100,area.h/2,Colour::LIGHTTEXT); + drawText(pictureError,100,area.h/2,DrawStyle::LIGHTTEXT); return; } } @@ -448,7 +448,7 @@ int VMediaView::handleCommand(int command) case Remote::DF_UP: case Remote::UP: case Remote::SKIPBACK: - rotate=WJpegCmplex::ROT_0; + rotate=WJpegComplex::ROT_0; showPicture(VMediaList::MV_PREV,slideshow,true); rt= 2; break; @@ -510,7 +510,7 @@ int VMediaView::handleCommand(int command) case Remote::RED: switch(rotate) { case WJpegComplex::ROT_0: - rotate=WJpeg::ROT_90; + rotate=WJpegComplex::ROT_90; break; case WJpegComplex::ROT_90: rotate=WJpegComplex::ROT_180; @@ -533,10 +533,10 @@ int VMediaView::handleCommand(int command) case Remote::BLUE: switch (cropmode) { case WJpegComplex::CROP: - cropmode=WJpeg::LETTER; + cropmode=WJpegComplex::LETTER; break; case WJpegComplex::LETTER: - cropmode=WJpeg::CROPPERCENT; + cropmode=WJpegComplex::CROPPERCENT; break; default: cropmode=WJpegComplex::CROP; @@ -1247,7 +1247,7 @@ void VMediaView::drawAudioInfo(){ len=strlen(first)+3; } else { - playerInfo=getPlayer()->getID3Info();drawText(tr("Loading"),5,3,Colour::LIGHTTEXT); + playerInfo=getPlayer()->getID3Info();drawText(tr("Loading"),5,3,DrawStyle::LIGHTTEXT); len=strlen(currentAudio->getDisplayName())+strlen(pl)+30+strlen(parent->getDirname(MEDIA_TYPE_AUDIO))+Media::TIMEBUFLEN+110; if (playerInfo) { for (UINT i=0;idraw(); //title - info->rectangle(0, 0, info->getWidth(), 30, Colour::TITLEBARBACKGROUND); - info->drawText(title, 5, 5, Colour::LIGHTTEXT); - info->drawPara(buf,5,32,Colour::LIGHTTEXT); + info->rectangle(0, 0, info->getWidth(), 30, DrawStyle::TITLEBARBACKGROUND); + info->drawText(title, 5, 5, DrawStyle::LIGHTTEXT); + info->drawPara(buf,5,32,DrawStyle::LIGHTTEXT); delete [] buf; if (! audioError) { WSymbol w; info->TEMPADD(&w); int x=10; int ybottom=info->getHeight(); - info->rectangle(0, ybottom - barRegion.h, info->getWidth(), barRegion.h, Colour::TITLEBARBACKGROUND); + info->rectangle(0, ybottom - barRegion.h, info->getWidth(), barRegion.h, DrawStyle::TITLEBARBACKGROUND); bool drawSymbol=true; switch(getPlayer()->getState()) { case AudioPlayer::S_PAUSE: @@ -1365,7 +1365,7 @@ void VMediaView::drawAudioInfo(){ } else { //stop symbol - info->rectangle(x, ybottom - 23, 18, 16, Colour::LIGHTTEXT); + info->rectangle(x, ybottom - 23, 18, 16, DrawStyle::LIGHTTEXT); } x+=30; drawAudioClocks(); @@ -1378,7 +1378,7 @@ void VMediaView::drawAudioClocks() { if (! info || ! audioEnabled) return; Log::getInstance()->log("VMediaView::drawAudioClocks", Log::DEBUG, ""); //draw clocks and bar - info->rectangle(clocksRegion, Colour::TITLEBARBACKGROUND); + info->rectangle(clocksRegion, DrawStyle::TITLEBARBACKGROUND); time_t currentSec = (time_t)(getPlayer()->getCurrentTimes()); time_t lengthSec=(time_t)(getPlayer()->getSonglen()); @@ -1405,13 +1405,13 @@ void VMediaView::drawAudioClocks() { //Log::getInstance()->log("VMediaView", Log::DEBUG, buffer); } - info->drawText(buffer, clocksRegion.x, clocksRegion.y, Colour::LIGHTTEXT); + info->drawText(buffer, clocksRegion.x, clocksRegion.y, DrawStyle::LIGHTTEXT); // Draw progress bar int progBarXbase = 0; int barlen=250; - info->rectangle(barRegion.x + progBarXbase, barRegion.y + 3, barlen+10, 24, Colour::LIGHTTEXT); + info->rectangle(barRegion.x + progBarXbase, barRegion.y + 3, barlen+10, 24, DrawStyle::LIGHTTEXT); info->rectangle(barRegion.x + progBarXbase + 2, barRegion.y + 5, barlen+6, 20, barBlue); if (currentSec > lengthSec) currentSec=lengthSec; @@ -1419,7 +1419,7 @@ void VMediaView::drawAudioClocks() { // Draw yellow portion int progressWidth = (barlen+2) * currentSec / lengthSec; - info->rectangle(barRegion.x + progBarXbase + 4, barRegion.y + 7, progressWidth, 16, Colour::SELECTHIGHLIGHT); + info->rectangle(barRegion.x + progBarXbase + 4, barRegion.y + 7, progressWidth, 16, DrawStyle::SELECTHIGHLIGHT); } @@ -1436,12 +1436,12 @@ void VMediaView::showAudioBanner() { audioBanner->setTitleBarOn(0); audioBanner->setDropThrough(); if ( ! currentAudio || ! currentAudio->getDisplayName() || audioError) { - audioBanner->drawText(tr("AudioPlayer - not playing"),5,3,Colour::LIGHTTEXT); + audioBanner->drawText(tr("AudioPlayer - not playing"),5,3,DrawStyle::LIGHTTEXT); } else { char * buf=new char[strlen(currentAudio->getDisplayName())+50]; SNPRINTF(buf,50,"%s %s",tr("AudioPlayer"),currentAudio->getDisplayName()); - audioBanner->drawText(buf,5,3,Colour::LIGHTTEXT); + audioBanner->drawText(buf,5,3,DrawStyle::LIGHTTEXT); delete buf; } BoxStack::getInstance()->add(audioBanner); diff --git a/vmediaview.h b/vmediaview.h index 5ed240d..7e6d10a 100644 --- a/vmediaview.h +++ b/vmediaview.h @@ -30,6 +30,7 @@ #include "vmedialist.h" #include "colour.h" #include "wjpeg.h" +#include "wjpegcomplex.h" #include "imagereader.h" #define TESTCOLOURS @@ -136,9 +137,9 @@ class VMediaView : public Boxx, public TimerReceiver WJpegComplex::Rotation rotate; WJpegComplex::ScaleMode cropmode; VInfo * info; - static Colour pictureBack; - static Colour infoBack; - static Colour audioBannerBack; + static DrawStyle pictureBack; + static DrawStyle infoBack; + static DrawStyle audioBannerBack; int currentScale; MediaOptions *options; WJpegComplex::JpegControl ctl; @@ -186,7 +187,7 @@ class VMediaView : public Boxx, public TimerReceiver bool justPlaying; Region barRegion; Region clocksRegion; - Colour barBlue; + DrawStyle barBlue; //retrigger info on events? bool retriggerAudioInfo; VInfo *audioBanner; diff --git a/wjpeg.h b/wjpeg.h index 4de5478..b52931a 100644 --- a/wjpeg.h +++ b/wjpeg.h @@ -48,12 +48,12 @@ class WJpeg : public Boxx }; -#if !defined(WIN32) || !defined(__ANDROID) -#define WJpegTYPE WJpegSimple -#include "wjpegsimple.h" -#else +#if defined(VOMP_PLATTFORM_MVP) //Complex jpegs only on mvp #define WJpegTYPE WJpegComplex #include "wjpegcomplex.h" +#else +#define WJpegTYPE WJpegSimple +#include "wjpegsimple.h" #endif #endif diff --git a/wjpegcomplex.cc b/wjpegcomplex.cc index b0a58f6..7b15168 100644 --- a/wjpegcomplex.cc +++ b/wjpegcomplex.cc @@ -47,7 +47,7 @@ extern "C" //a struct to store user data for the jpeg decompressor class jpegUserData{ public: - WJpeg::JpegControl * ctl; + WJpegComplex::JpegControl * ctl; JpegReader *reader; jpegUserData() { ctl=NULL; @@ -516,13 +516,13 @@ get_exif_orient (j_decompress_ptr cinfo) ud=(jpegUserData *)(mysrc->userdata); switch(orient) { case 3: - ud->ctl->exifRotation=WJpeg::ROT_180; + ud->ctl->exifRotation=WJpegComplex::ROT_180; break; case 6: - ud->ctl->exifRotation=WJpeg::ROT_90; + ud->ctl->exifRotation=WJpegComplex::ROT_90; break; case 8: - ud->ctl->exifRotation=WJpeg::ROT_270; + ud->ctl->exifRotation=WJpegComplex::ROT_270; break; } @@ -589,9 +589,9 @@ void WJpegComplex::draw() SNPRINTF(errbuf,200,"jpeg reader not initialized"); } if (! ok) { - drawTextCentre(tr("Jpeg ERROR"), 240, 170, Colour::LIGHTTEXT); - if (errbuf[0] != 0) drawTextCentre(errbuf,240,200, Colour::LIGHTTEXT); - if (ctl.error[0] != 0) drawTextCentre(ctl.error,240,230, Colour::LIGHTTEXT); + drawTextCentre(tr("Jpeg ERROR"), 240, 170, DrawStyle::LIGHTTEXT); + if (errbuf[0] != 0) drawTextCentre(errbuf,240,200, DrawStyle::LIGHTTEXT); + if (ctl.error[0] != 0) drawTextCentre(ctl.error,240,230, DrawStyle::LIGHTTEXT); } } @@ -607,7 +607,7 @@ void WJpegComplex::draw() #ifndef __ANDROID__ -bool WJpegComplex::drawJpeg(JpegControl * ctl,Surface * sfc,JpegReader *rdr, Colour & backgroundColour) { +bool WJpegComplex::drawJpeg(JpegControl * ctl,Surface * sfc,JpegReader *rdr, DrawStyle & backgroundColour) { Log* logger = Log::getInstance(); if (! rdr || ! sfc) { logger->log("BJpeg", Log::ERR, "JPEG error rdr=NULL or sfc=NULL"); @@ -779,7 +779,7 @@ bool WJpegComplex::drawJpeg(JpegControl * ctl,Surface * sfc,JpegReader *rdr, Col picturew, pictureh,xpos,ypos,jpegwidth,jpegheight,(int)ctl->finalRotation*90); //fill the background - sfc->fillblt(ctl->area.x,ctl->area.y,ctl->area.w,ctl->area.h,backgroundColour.rgba()); + sfc->fillblt(ctl->area.x,ctl->area.y,ctl->area.w,ctl->area.h,backgroundColour); //line len in bytes (3 bytes per Pixel) - for buffer (can be bigger then surface) int linelen=jpegwidth*3; @@ -807,7 +807,7 @@ bool WJpegComplex::drawJpeg(JpegControl * ctl,Surface * sfc,JpegReader *rdr, Col int rowsread = 0; - Colour c; + DrawStyle c; sfc->startFastDraw();//Tell the surface, that we will draw a lot of pixel, //so that performance, can be optimized logger->log("BJpeg", Log::DEBUG, "start drawing "); @@ -876,7 +876,7 @@ bool WJpegComplex::drawJpeg(JpegControl * ctl,Surface * sfc,JpegReader *rdr, Col #else -bool WJpegComplex::drawJpeg(JpegControl * ctl,Surface * sfc,JpegReader *rdr, Colour & backgroundColour) { +bool WJpegComplex::drawJpeg(JpegControl * ctl,Surface * sfc,JpegReader *rdr, DrawStyle & backgroundColour) { return true; } #endif diff --git a/wjpegcomplex.h b/wjpegcomplex.h index 06f9ebd..008e4a5 100644 --- a/wjpegcomplex.h +++ b/wjpegcomplex.h @@ -141,7 +141,7 @@ class WJpegComplex : public WJpeg //the reader has to be initialized before //calling this function does not need a WJpeg being instantiated //it simply draws into the surface - bool static drawJpeg(JpegControl * control, Surface* sfc, JpegReader *rdr, Colour & backgroundColour); + bool static drawJpeg(JpegControl * control, Surface* sfc, JpegReader *rdr, DrawStyle & backgroundColour); private: //our drawPixel with considers rotation -- 2.39.5