From 943c899288181988013dca3558a2382937f36f3f Mon Sep 17 00:00:00 2001 From: Manuel Reimer Date: Tue, 28 Oct 2014 16:54:37 +0100 Subject: [PATCH] First cleanup of image loading code --- libcore/imageloader.c | 12 ++--- libcore/imageloader.h | 4 +- libcore/imagemagickwrapper.c | 92 +++--------------------------------- libcore/imagemagickwrapper.h | 5 -- views/view.c | 6 ++- 5 files changed, 16 insertions(+), 103 deletions(-) diff --git a/libcore/imageloader.c b/libcore/imageloader.c index 61e8076..07b324e 100644 --- a/libcore/imageloader.c +++ b/libcore/imageloader.c @@ -14,16 +14,12 @@ cImageLoader::cImageLoader() : cImageMagickWrapper() { cImageLoader::~cImageLoader() { } -cImage cImageLoader::GetImage() { - return CreateImageCopy(); +cImage *cImageLoader::GetImage(int width, int height) { + return CreateImage(width, height, false); } -bool cImageLoader::LoadImage(const char *path, int width, int height) { - if (cImageMagickWrapper::LoadImage(path)) { - buffer.sample(Geometry(width, height)); - return true; - } - return false; +bool cImageLoader::LoadImage(const char *path) { + return cImageMagickWrapper::LoadImage(path); } void cImageLoader::DeterminateChannelLogoSize(int &width, int &height) { diff --git a/libcore/imageloader.h b/libcore/imageloader.h index 2a148be..b2966c9 100644 --- a/libcore/imageloader.h +++ b/libcore/imageloader.h @@ -14,8 +14,8 @@ class cImageLoader : public cImageMagickWrapper { public: cImageLoader(); ~cImageLoader(); - cImage GetImage(); - bool LoadImage(const char *path, int width, int height); + cImage *GetImage(int width, int height); + bool LoadImage(const char *path); void DeterminateChannelLogoSize(int &width, int &height); private: }; diff --git a/libcore/imagemagickwrapper.c b/libcore/imagemagickwrapper.c index ab1bcba..b95aeb5 100644 --- a/libcore/imagemagickwrapper.c +++ b/libcore/imagemagickwrapper.c @@ -48,51 +48,6 @@ cImage *cImageMagickWrapper::CreateImage(int width, int height, bool preserveAsp return image; } -cImage cImageMagickWrapper::CreateImageCopy() { - int w, h; - w = buffer.columns(); - h = buffer.rows(); - cImage image (cSize(w, h)); - const PixelPacket *pixels = buffer.getConstPixels(0, 0, w, h); - for (int iy = 0; iy < h; ++iy) { - for (int ix = 0; ix < w; ++ix) { - tColor col = (~int(pixels->opacity * 255 / MaxRGB) << 24) - | (int(pixels->green * 255 / MaxRGB) << 8) - | (int(pixels->red * 255 / MaxRGB) << 16) - | (int(pixels->blue * 255 / MaxRGB) ); - image.SetPixel(cPoint(ix, iy), col); - ++pixels; - } - } - return image; -} - -bool cImageMagickWrapper::LoadImage(std::string FileName, std::string Path, std::string Extension) { - try { - std::stringstream sstrImgFile; - sstrImgFile << Path << FileName << "." << Extension; - std::string imgFile = sstrImgFile.str(); - if (config.debugImageLoading) - dsyslog("skindesigner: trying to load: %s", imgFile.c_str()); - buffer.read(imgFile.c_str()); - if (config.debugImageLoading) - dsyslog("skindesigner: %s sucessfully loaded", imgFile.c_str()); - } catch( Magick::Warning &warning ) { - if (config.debugImageLoading) - dsyslog("skindesigner: Magick Warning: %s", warning.what()); - return true; - } catch( Magick::Error &error ) { - if (config.debugImageLoading) - dsyslog("skindesigner: Magick Error: %s", error.what()); - return false; - } catch(...) { - if (config.debugImageLoading) - dsyslog("skindesigner: an unknown Magick error occured during image loading"); - return false; - } - return true; -} - bool cImageMagickWrapper::LoadImage(const char *fullpath) { if ((fullpath == NULL) || (strlen(fullpath) < 5)) return false; @@ -118,45 +73,10 @@ bool cImageMagickWrapper::LoadImage(const char *fullpath) { return true; } -Color cImageMagickWrapper::Argb2Color(tColor col) { - tIndex alpha = (col & 0xFF000000) >> 24; - tIndex red = (col & 0x00FF0000) >> 16; - tIndex green = (col & 0x0000FF00) >> 8; - tIndex blue = (col & 0x000000FF); - Color color(MaxRGB*red/255, MaxRGB*green/255, MaxRGB*blue/255, MaxRGB*(0xFF-alpha)/255); - return color; -} - -void cImageMagickWrapper::CreateGradient(tColor back, tColor blend, int width, int height, double wfactor, double hfactor) { - Color Back = Argb2Color(back); - Color Blend = Argb2Color(blend); - int maxw = MaxRGB * wfactor; - int maxh = MaxRGB * hfactor; - - Image imgblend(Geometry(width, height), Blend); - imgblend.modifyImage(); - imgblend.type(TrueColorMatteType); - PixelPacket *pixels = imgblend.getPixels(0, 0, width, height); - for (int x = 0; x < width; x++) { - for (int y = 0; y < height; y++) { - PixelPacket *pixel = pixels + y * width + x; - int opacity = (maxw / width * x + maxh - maxh / height * y) / 2; - pixel->opacity = (opacity <= MaxRGB) ? opacity : MaxRGB; - } - } - imgblend.syncPixels(); - - Image imgback(Geometry(width, height), Back); - imgback.composite(imgblend, 0, 0, OverCompositeOp); - - buffer = imgback; -} - -void cImageMagickWrapper::CreateBackground(tColor back, tColor blend, int width, int height, bool mirror) { - CreateGradient(back, blend, width, height, 0.8, 0.8); - if (mirror) - buffer.flop(); -} -void cImageMagickWrapper::CreateBackgroundReverse(tColor back, tColor blend, int width, int height) { - CreateGradient(back, blend, width, height, 1.3, 0.7); +// Just a different way to call LoadImage. Calls the above one. +bool cImageMagickWrapper::LoadImage(std::string FileName, std::string Path, std::string Extension) { + std::stringstream sstrImgFile; + sstrImgFile << Path << FileName << "." << Extension; + std::string imgFile = sstrImgFile.str(); + return LoadImage(imgFile.c_str()); } diff --git a/libcore/imagemagickwrapper.h b/libcore/imagemagickwrapper.h index 5f9901e..da327a9 100644 --- a/libcore/imagemagickwrapper.h +++ b/libcore/imagemagickwrapper.h @@ -10,19 +10,14 @@ using namespace Magick; class cImageMagickWrapper { private: - void CreateGradient(tColor back, tColor blend, int width, int height, double wfactor, double hfactor); public: cImageMagickWrapper(); ~cImageMagickWrapper(); protected: Image buffer; - Color Argb2Color(tColor col); cImage *CreateImage(int width, int height, bool preserveAspect = true); - cImage CreateImageCopy(void); bool LoadImage(std::string FileName, std::string Path, std::string Extension); bool LoadImage(const char *fullpath); - void CreateBackground(tColor back, tColor blend, int width, int height, bool mirror = false); - void CreateBackgroundReverse(tColor back, tColor blend, int width, int height); }; #endif //__NOPACITY_IMAGEMAGICKWRAPPER_H diff --git a/views/view.c b/views/view.c index 75a24e0..8711136 100644 --- a/views/view.c +++ b/views/view.c @@ -711,8 +711,10 @@ void cView::DoDrawImage(int num, cTemplateFunction *func, int x0, int y0) { break; } case itImage: { cImageLoader imgLoader; - if (imgLoader.LoadImage(path.c_str(), width, height)) { - DrawImage(num, pos, imgLoader.GetImage()); + if (imgLoader.LoadImage(path.c_str())) { + cImage *image = imgLoader.GetImage(width, height); + DrawImage(num, pos, *image); + delete(image); } break; } default: