[Wavelet-commit] Wavelet/test magickinter.cc, NONE, 1.1 Makefile.in, 1.5, 1.6 Makefile.msc, 1.4, 1.
Status: Beta
Brought to you by:
herbert
Menu
▾
▴
[Wavelet-commit] Wavelet/test magickinter.cc, NONE, 1.1 Makefile.in, 1.5, 1.6 Makefile.msc, 1.4, 1.5 Makefile.watcomc, 1.4, 1.5 videos.cc, 1.10, 1.11 wavelet.cc, 1.4, 1.5
|
From: Herbert M. D. <he...@us...> - 2008-04-17 07:27:43
|
Update of /cvsroot/wavelet/Wavelet/test In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv13454/test Modified Files: Makefile.in Makefile.msc Makefile.watcomc videos.cc wavelet.cc Added Files: magickinter.cc Log Message: Optional support for using ImageMagick's Magick++ classes for reading and writing images, also some minor additions. Index: Makefile.in =================================================================== RCS file: /cvsroot/wavelet/Wavelet/test/Makefile.in,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Makefile.in 7 Aug 2007 17:01:00 -0000 1.5 --- Makefile.in 17 Apr 2008 07:27:36 -0000 1.6 *************** *** 45,49 **** filename_test image_test wavelet_test coeffinfo_test ntree_test \ imageinfo_test colorimage_test transform_test histogram_test \ ! videos_test imageresizer_test PROGRAMS = $(TESTS:_test=$E) benchmark$E DEPENDS = $(TESTS:_test=.dd) benchmark.dd --- 45,49 ---- filename_test image_test wavelet_test coeffinfo_test ntree_test \ imageinfo_test colorimage_test transform_test histogram_test \ ! videos_test imageresizer_test magickinter_test PROGRAMS = $(TESTS:_test=$E) benchmark$E DEPENDS = $(TESTS:_test=.dd) benchmark.dd *************** *** 117,124 **** @-rm -f harin[0-9][0-9]*.pgm harin-*.vid temp-*.avi # # Flags passed to the compiler # ! CPPFLAGS = -I../.. -I.. @CPPFLAGS@ @PFI_DEF@ @JPEG_DEF@ CXXSHARED = CXXDEBUG = @CXXDEBUG@ --- 117,128 ---- @-rm -f harin[0-9][0-9]*.pgm harin-*.vid temp-*.avi + magickinter_test: magickinter$E + @./$< + @-rm -f out.* + # # Flags passed to the compiler # ! CPPFLAGS = -I../.. -I.. @CPPFLAGS@ @PFI_DEF@ @JPEG_DEF@ @MAGICK_INTER_DEF@ CXXSHARED = CXXDEBUG = @CXXDEBUG@ *************** *** 126,130 **** CXXWARN = @CXXWARN@ CXXMISC = ! LDFLAGS = @LDFLAGS@ @PFI_LIB@ @JPEG_LIB@ -lm CXXFLAGS = $(CPPFLAGS) $(CXXSHARED) $(CXXOPT) $(CXXDEBUG) $(CXXWARN) $(CXXMISC) --- 130,134 ---- CXXWARN = @CXXWARN@ CXXMISC = ! LDFLAGS = @LDFLAGS@ @PFI_LIB@ @MAGICK_INTER_LIB@ @JPEG_LIB@ -lm CXXFLAGS = $(CPPFLAGS) $(CXXSHARED) $(CXXOPT) $(CXXDEBUG) $(CXXWARN) $(CXXMISC) *************** *** 193,196 **** --- 197,203 ---- $(CXX) $(CXXFLAGS) $^ -o $@ $(LDFLAGS) + magickinter$E: magickinter$O ../libwavelet$A + $(CXX) $(CXXFLAGS) $^ -o $@ $(LDFLAGS) + ../libwavelet$A: ../*.cc ../*.hh ../Wave/*.hh ../*.h $(MAKE) -C ../ static Index: wavelet.cc =================================================================== RCS file: /cvsroot/wavelet/Wavelet/test/wavelet.cc,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** wavelet.cc 7 Aug 2007 17:01:00 -0000 1.4 --- wavelet.cc 17 Apr 2008 07:27:36 -0000 1.5 *************** *** 39,43 **** struct filter { FilterSet *filterset; ! char *name; int substeps; } filters[] = { --- 39,43 ---- struct filter { FilterSet *filterset; ! const char *name; int substeps; } filters[] = { Index: videos.cc =================================================================== RCS file: /cvsroot/wavelet/Wavelet/test/videos.cc,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** videos.cc 7 Aug 2007 17:01:00 -0000 1.10 --- videos.cc 17 Apr 2008 07:27:36 -0000 1.11 *************** *** 435,439 **** } ! char *fname = "harin.vid"; c = 1; y = 240; --- 435,439 ---- } ! const char *fname = "harin.vid"; c = 1; y = 240; Index: Makefile.watcomc =================================================================== RCS file: /cvsroot/wavelet/Wavelet/test/Makefile.watcomc,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile.watcomc 7 Aug 2007 17:01:00 -0000 1.4 --- Makefile.watcomc 17 Apr 2008 07:27:36 -0000 1.5 *************** *** 5,9 **** filename_test image_test wavelet_test coeffinfo_test ntree_test & imageinfo_test colorimage_test transform_test histogram_test & ! videos_test imageresizer_test PROGRAMS = imagearray$E vectors$E position$E imagefile$E filename$E image$E & wavelet$E coeffinfo$E imageinfo$E colorimage$E benchmark$E ntree$E & --- 5,9 ---- filename_test image_test wavelet_test coeffinfo_test ntree_test & imageinfo_test colorimage_test transform_test histogram_test & ! videos_test imageresizer_test magickinter_test PROGRAMS = imagearray$E vectors$E position$E imagefile$E filename$E image$E & wavelet$E coeffinfo$E imageinfo$E colorimage$E benchmark$E ntree$E & *************** *** 11,15 **** OBJECTS = imagearray$O vectors$O position$O imagefile$O filename$O image$O & wavelet$O coeffinfo$O imageinfo$O colorimage$O benchmark$O ntree$O & ! transform$O histogram$O benchmark$O videos$O imageresizer$O CPPFLAGS = -i=.. -i=..\..\pfi -dDPRINTF="" -dPFI -dJPEG --- 11,16 ---- OBJECTS = imagearray$O vectors$O position$O imagefile$O filename$O image$O & wavelet$O coeffinfo$O imageinfo$O colorimage$O benchmark$O ntree$O & ! transform$O histogram$O benchmark$O videos$O imageresizer$O & ! magickinter$O CPPFLAGS = -i=.. -i=..\..\pfi -dDPRINTF="" -dPFI -dJPEG *************** *** 85,88 **** --- 86,93 ---- @-del harin[0-9][0-9]*.pgm harin-*.vid + magickinter_test: magickinter$E .SYMBOLIC + @.\\magickinter$E + @-del out.* + clean : .SYMBOLIC -del $(PROGRAMS) $(OBJECTS) --- NEW FILE: magickinter.cc --- /* * Test program for the class ImageResizer * * $Date: 2008/04/17 07:27:36 $ * $Revision: 1.1 $ * */ #ifdef NDEBUG #undef NDEBUG #endif /* NDEBUG */ #include <iostream> #ifdef MAGICK_INTER // if this feature is not available, we don't do anything! #include "WImage/MagickInter.hh" #include "testing.h" #include <cassert> #include <memory> #include <stdexcept> #if !(defined __WATCOMC__ && __WATCOMC__ < 1230) using namespace std; #endif int main (void) { cout << "Testing MagickInter utilities...\n"; std::auto_ptr<ColorImage> ip1 (NEW (ColorImage ())); TEST_NO_EXCEPTION (ip1->read ("christina57.jpg")); // 594x448 TEST_NO_EXCEPTION (MagickInter::writeColorImageWithTransparency (*ip1, "out.png")); std::auto_ptr<ColorImage> ip2 = MagickInter::obtainColorImage ("out.png"); ip1->write ("out1.ppm"); ip2->write ("out2.ppm"); TEST_ASSERT(ip1->epsilons (*ip2, 0.01)); cout << "done.\n"; return 0; } #else int main (void) { std::cout << "No MagickInter support, nothting to do!" << std::endl; return 0; } #endif Index: Makefile.msc =================================================================== RCS file: /cvsroot/wavelet/Wavelet/test/Makefile.msc,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile.msc 7 Aug 2007 17:01:00 -0000 1.4 --- Makefile.msc 17 Apr 2008 07:27:36 -0000 1.5 *************** *** 30,37 **** filename_test image_test wavelet_test coeffinfo_test ntree_test \ imageinfo_test colorimage_test transform_test histogram_test \ ! videos_test imageresizer_test PROGRAMS = imagearray$E vectors$E position$E imagefile$E filename$E image$E \ wavelet$E coeffinfo$E imageinfo$E colorimage$E benchmark$E ntree$E \ ! transform$E histogram$E videos$E imageresizer$E tests: $(TESTS) --- 30,37 ---- filename_test image_test wavelet_test coeffinfo_test ntree_test \ imageinfo_test colorimage_test transform_test histogram_test \ ! videos_test imageresizer_test magickinter_test PROGRAMS = imagearray$E vectors$E position$E imagefile$E filename$E image$E \ wavelet$E coeffinfo$E imageinfo$E colorimage$E benchmark$E ntree$E \ ! transform$E histogram$E videos$E imageresizer$E magickinter$E tests: $(TESTS) *************** *** 101,104 **** --- 101,108 ---- @-del harin[0-9][0-9]*.pgm harin-*.vid + magickinter_test: magickinter$E + @.\\magickinter$E + @-del out.* + # # Flags passed to the compiler *************** *** 140,143 **** --- 144,148 ---- videos$E: videos$O imageresizer$E: imageresizer$O + magickinter$E: magickinter$O clean: |
