From 6c6620339539eea1cd7d096e810cf9021e31bfe4 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Thu, 10 Sep 2009 08:09:07 +0000 Subject: [PATCH] 2009-09-10 10:08 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbfimage/Makefile * contrib/hbfimage/tests/fitest.prg + contrib/hbfimage/freeimag.ch - contrib/hbfimage/freeimage.ch ! Renamed last public long filename in Harbour source tree. This lib could in theory be compiled for dos, but this is not yet possible to not-yet-cleaned core from Windows types (LONG, DWORD, WORD, BOOL). ; INCOMPATIBLE: Please modify your source to use the new header name. --- harbour/ChangeLog | 12 ++++ harbour/contrib/hbfimage/Makefile | 2 +- .../hbfimage/{freeimage.ch => freeimag.ch} | 0 harbour/contrib/hbfimage/tests/fitest.prg | 66 +++++++++---------- 4 files changed, 46 insertions(+), 34 deletions(-) rename harbour/contrib/hbfimage/{freeimage.ch => freeimag.ch} (100%) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 9cb505cdb5..6f0ea3c8c0 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,18 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-09-10 10:08 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * contrib/hbfimage/Makefile + * contrib/hbfimage/tests/fitest.prg + + contrib/hbfimage/freeimag.ch + - contrib/hbfimage/freeimage.ch + ! Renamed last public long filename in Harbour source tree. + This lib could in theory be compiled for dos, but this is + not yet possible to not-yet-cleaned core from Windows + types (LONG, DWORD, WORD, BOOL). + ; INCOMPATIBLE: Please modify your source to use the new header + name. + 2009-09-10 09:52 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * external/libhpdf/Makefile + Enabled for all dos platforms (dos/watcom currently and diff --git a/harbour/contrib/hbfimage/Makefile b/harbour/contrib/hbfimage/Makefile index feca0b7bed..1dcecc1d26 100644 --- a/harbour/contrib/hbfimage/Makefile +++ b/harbour/contrib/hbfimage/Makefile @@ -15,7 +15,7 @@ C_SOURCES := \ PRG_SOURCES := \ PRG_HEADERS := \ - freeimage.ch \ + freeimag.ch \ _DET_DSP_NAME := freeimage _DET_VAR_INC_ := HB_INC_FREEIMAGE diff --git a/harbour/contrib/hbfimage/freeimage.ch b/harbour/contrib/hbfimage/freeimag.ch similarity index 100% rename from harbour/contrib/hbfimage/freeimage.ch rename to harbour/contrib/hbfimage/freeimag.ch diff --git a/harbour/contrib/hbfimage/tests/fitest.prg b/harbour/contrib/hbfimage/tests/fitest.prg index c94961adbe..8413be84af 100644 --- a/harbour/contrib/hbfimage/tests/fitest.prg +++ b/harbour/contrib/hbfimage/tests/fitest.prg @@ -8,7 +8,7 @@ * FreeImage API test file */ -#include "freeimage.ch" +#include "freeimag.ch" #include "common.ch" #include "fileio.ch" @@ -21,9 +21,9 @@ PROCEDURE Main() LOCAL im, clone, rotated, rotatedEx, rescale, im2, im3 LOCAL centerX, centerY, width, height, appo LOCAL bmpinfoheader - LOCAL bmpinfo - LOCAL bkcolor - LOCAL iccprofile + LOCAL bmpinfo + LOCAL bkcolor + LOCAL iccprofile LOCAL x //? "Press Alt-D + Enter to activate debug" @@ -50,12 +50,12 @@ PROCEDURE Main() ? "Load JPEG directly from file" im := fi_Load( FIF_JPEG, IMAGES_IN + "sample1.jpg", JPEG_DEFAULT ) - + ? "Clone image" clone := fi_Clone( im ) - + ? "Pointer :", ValToPrg( im ) - + ? "Image Type :", fi_GetImageType( im ) ? "Color Used :", fi_GetColorsUsed( im ) ? "Pixel size :", fi_GetBPP( im ) @@ -76,84 +76,84 @@ PROCEDURE Main() ? "Save BMP ? :", fi_Save( FIF_BMP , im, IMAGES_OUT + "sample1.bmp", BMP_DEFAULT ) ? "Save JPG ? :", fi_Save( FIF_JPEG, im, IMAGES_OUT + "sample1.jpg", JPEG_DEFAULT ) ? "Save PNG ? :", fi_Save( FIF_PNG , im, IMAGES_OUT + "sample1.png", PNG_DEFAULT ) - + ? "Save TIFF ? :", fi_Save( FIF_TIFF, clone, IMAGES_OUT + "sample1.tif", TIFF_DEFAULT ) ? "Flip Horizontal ?:", fi_FlipHorizontal( clone ) ? "Save JPG ? :", fi_Save( FIF_JPEG, clone, IMAGES_OUT + "horizont.jpg", JPEG_DEFAULT ) ? "Flip Vertical ? :", fi_FlipVertical( clone ) ? "Save JPG ? :", fi_Save( FIF_JPEG, clone, IMAGES_OUT + "vertical.jpg", JPEG_DEFAULT ) - + ? "Rotate Classic :", ValToPrg( rotated := fi_RotateClassic( clone, 90 ) ) ? "Save JPG ? :", fi_Save( FIF_JPEG, rotated, IMAGES_OUT + "rotate.jpg", JPEG_DEFAULT ) fi_Unload( rotated ) - + centerx := fi_GetWidth( clone ) / 2 centery := fi_GetHeight( clone ) / 2 ? "Rotate Ex :", ValToPrg( rotatedEx := fi_RotateEx( clone, 15, 0, 0, centerx, centery, TRUE ) ) ? "Save JPG ? :", fi_Save( FIF_JPEG, rotatedEx, IMAGES_OUT + "rotateex.jpg", JPEG_DEFAULT ) fi_Unload( rotatedEx ) - + width := fi_GetWidth( im ) height := fi_GetHeight( im ) - + ? "Rescale :", ValToPrg( rescale := fi_Rescale( im, width / 2, height / 2, FILTER_BICUBIC ) ) ? "Save JPG ? :", fi_Save( FIF_JPEG, rescale, IMAGES_OUT + "rescale.jpg", JPEG_DEFAULT ) fi_Unload( rescale ) - + im2 := fi_Clone( im ) ? "Adjust Gamma ? :", fi_AdjustGamma( im2, 3.0 ) ? "Save JPG ? :", fi_Save( FIF_JPEG, im2, IMAGES_OUT + "adjgamma.jpg", JPEG_DEFAULT ) fi_Unload( im2 ) - + im2 := fi_Clone( im ) ? "Adjust Brightness:", fi_AdjustBrightness( im2, -30 ) ? "Save JPG ? :", fi_Save( FIF_JPEG, im2, IMAGES_OUT + "adjbrigh.jpg", JPEG_DEFAULT ) fi_Unload( im2 ) - + im2 := fi_Clone( im ) ? "Adjust Contrast ?:", fi_AdjustContrast( im2, -30 ) ? "Save JPG ? :", fi_Save( FIF_JPEG, im2, IMAGES_OUT + "adjcontr.jpg", JPEG_DEFAULT ) fi_Unload( im2 ) - + im2 := fi_Clone( im ) ? "Invert ? :", fi_Invert( im2 ) ? "Save JPG ? :", fi_Save( FIF_JPEG, im2, IMAGES_OUT + "invert.jpg", JPEG_DEFAULT ) fi_Unload( im2 ) - + ? "Red Channel :", ValToPrg( im2 := fi_GetChannel( im, FICC_RED ) ) ? "Save JPG ? :", fi_Save( FIF_JPEG, im2, IMAGES_OUT + "red.jpg", JPEG_DEFAULT ) fi_Unload( im2 ) - + ? "Green Channel :", ValToPrg( im2 := fi_GetChannel( im, FICC_GREEN ) ) ? "Save JPG ? :", fi_Save( FIF_JPEG, im2, IMAGES_OUT + "green.jpg", JPEG_DEFAULT ) fi_Unload( im2 ) - + ? "Blue Channel :", ValToPrg( im2 := fi_GetChannel( im, FICC_BLUE ) ) ? "Save JPG ? :", fi_Save( FIF_JPEG, im2, IMAGES_OUT + "blue.jpg", JPEG_DEFAULT ) fi_Unload( im2 ) - + ? "Copy :", ValToPrg( im2 := fi_Copy( im, 300, 100, 800, 200 ) ) ? "Save JPG ? :", fi_Save( FIF_JPEG, im2, IMAGES_OUT + "copy.jpg", JPEG_DEFAULT ) - + im3 := fi_Clone( im ) ? "Paste ? :", fi_Paste( im3, im2, 10, 10, 70 ) ? "Save JPG ? :", fi_Save( FIF_JPEG, im3, IMAGES_OUT + "paste.jpg", JPEG_DEFAULT ) fi_Unload( im2 ) fi_Unload( im3 ) - + ? "Allocate Bitmap :", ValToPrg( im3 := fi_AllocateT( FIT_BITMAP, 320, 200, 32 ) ) ? "Save JPG ? :", fi_Save( FIF_JPEG, im3, IMAGES_OUT + "allocate.jpg", JPEG_DEFAULT ) fi_Unload( im3 ) - + ? "Create ERROR :" ? "Save GIF ? :", fi_Save( FIF_GIF, im, IMAGES_OUT + "wrong.gif", 0 ) - + //? ValToPrg( fi_GetInfoHeader( im ) ) //bmpinfoheader:Buffer( fi_GetInfoHeader( im ), TRUE ) //bmpinfoheader:Pointer( fi_GetInfoHeader( im ) ) //? "Header :", ValToPrg( bmpinfoheader ) //? bmpinfoheader:SayMembers(" ", .t., .t.) - + //bmpinfo:Pointer( fi_GetInfo( im ) ) ? "Info :", ValToPrg( bmpinfo ) //? bmpinfo:SayMembers(" ", .t., .t.) @@ -161,13 +161,13 @@ PROCEDURE Main() //? ValType( bmpinfo:Devalue() ) //Tracelog( "bmpinfoheader", ValToPrg( bmpinfoheader ), ; // bmpinfoheader:SayMembers(, .t.), bmpinfoheader:Value(), bmpinfoheader:DeValue(), hb_dumpvar( bmpinfoheader:Array() ), hb_dumpvar( bmpinfoheader:acMembers ) ) - + //appo := bkcolor:Value() //? bkcolor:Pointer( fi_GetBackgroundColor( im ) ) //? fi_GetBackgroundColor( im, @bkcolor:Value() ) //bkcolor:Buffer( appo ) //? bkcolor:SayMembers(" ", .t., .t.) - + //bkcolor:rgbBlue := 205 //? fi_SetBackgroundColor( im, hb_String2Pointer( bkcolor:Value() ) ) Tracelog("linha 168") @@ -180,23 +180,23 @@ PROCEDURE Main() //bkcolor:Buffer( appo ) Tracelog("linha 176") //? bkcolor:SayMembers(" ", .t., .t.) - + Tracelog("linha 179") //iccprofile:Pointer( fi_GetICCProfile( im ) ) Tracelog("linha 181") //? "Header :", ValToPrg( iccprofile ) Tracelog("linha 183") //? iccprofile:SayMembers(" ", .t., .t.) - + //bmpinfoheader:Reset() //appo := NIL //bmpinfoheader := NIL //hb_GCAll( .T. ) - + ? "Unload images from memory" fi_Unload( im ) fi_Unload( clone ) - + // IF (nH := FOpen(IMAGES_IN + "sample1.jpg")) != F_ERROR @@ -205,10 +205,10 @@ PROCEDURE Main() cStr := space(nLen) fRead(nH, @cStr, nLen) FClose(nH) - + ? "Load JPEG from memory" im := fi_LoadFromMem( FIF_JPEG, cStr, JPEG_DEFAULT ) - + ? "Pointer :", ValToPrg( im ) ? "Image Type :", fi_GetImageType( im ) ? "Save PNG ? :", fi_Save( FIF_PNG, im, IMAGES_OUT + "sample2.png", PNG_DEFAULT )