diff options
| author | knarf <knarf@eff87b29-5268-4891-90a3-a07138403961> | 2010-09-08 19:30:01 +0000 |
|---|---|---|
| committer | knarf <knarf@eff87b29-5268-4891-90a3-a07138403961> | 2010-09-08 19:30:01 +0000 |
| commit | fc459ff09a5a522607e7c94c347107a3432ba251 (patch) | |
| tree | c444be683440785410340129073e62c53a7c0985 | |
| parent | e90d88755866dbabe0591bae096d27ebc9ed4858 (diff) | |
require libjpeg, not jpeg6b anymore
git-svn-id: http://svn.cactuscode.org/arrangements/CactusIO/IOJpeg/trunk@135 eff87b29-5268-4891-90a3-a07138403961
| -rw-r--r-- | configuration.ccl | 3 | ||||
| -rw-r--r-- | par/CarpetIOJpeg.par | 2 | ||||
| -rw-r--r-- | par/jpeg.par | 2 | ||||
| -rw-r--r-- | par/jpeg.th | 2 | ||||
| -rw-r--r-- | par/jpeg_amr.par | 2 | ||||
| -rw-r--r-- | par/jpeg_amr.th | 2 |
6 files changed, 6 insertions, 7 deletions
diff --git a/configuration.ccl b/configuration.ccl index 0b24f1b..4424c7a 100644 --- a/configuration.ccl +++ b/configuration.ccl @@ -1,4 +1,3 @@ # Configuration definitions for thorn IOJpeg -# $Header$ -REQUIRES jpeg6b +REQUIRES libjpeg diff --git a/par/CarpetIOJpeg.par b/par/CarpetIOJpeg.par index bd665e7..7c7b8e8 100644 --- a/par/CarpetIOJpeg.par +++ b/par/CarpetIOJpeg.par @@ -1,4 +1,4 @@ -ActiveThorns = "Boundary CoordBase CartGrid3D SymBase Time LoopControl Carpet CarpetReduce CarpetSlab CarpetLib CarpetRegrid IOUtil CarpetIOBasic IDScalarWaveC WaveToyC IOJpeg jpeg6b LocalInterp HTTPD HTTPDExtra Socket" +ActiveThorns = "Boundary CoordBase CartGrid3D SymBase Time LoopControl Carpet CarpetReduce CarpetSlab CarpetLib CarpetRegrid IOUtil CarpetIOBasic IDScalarWaveC WaveToyC IOJpeg libjpeg LocalInterp HTTPD HTTPDExtra Socket" Cactus::cctk_run_title = "Carpet WaveToy Demo with HTTPD and live Visualization" diff --git a/par/jpeg.par b/par/jpeg.par index b0cda8f..aa09668 100644 --- a/par/jpeg.par +++ b/par/jpeg.par @@ -16,7 +16,7 @@ ActiveThorns = "CoordBase SymBase CartGrid3D Boundary Time" ActiveThorns = "IDScalarWaveC WaveToyC WaveBinarySource" ActiveThorns = "IOUtil IOBasic" ActiveThorns = "Socket HTTPD HTTPDExtra" -ActiveThorns = "IOJpeg jpeg6b LocalInterp LocalReduce" +ActiveThorns = "IOJpeg libjpeg LocalInterp LocalReduce" Cactus::cctk_run_title = "WaveToy/httpd Example" diff --git a/par/jpeg.th b/par/jpeg.th index 3bdcadd..151f070 100644 --- a/par/jpeg.th +++ b/par/jpeg.th @@ -14,4 +14,4 @@ CactusPUGH/PUGHSlab CactusWave/IDScalarWaveC CactusWave/WaveBinarySource CactusWave/WaveToyC -CactusExternal/jpeg6b +ExternalLibraries/libjpeg diff --git a/par/jpeg_amr.par b/par/jpeg_amr.par index 7d91c1b..ab4ab7c 100644 --- a/par/jpeg_amr.par +++ b/par/jpeg_amr.par @@ -15,7 +15,7 @@ ActiveThorns = " Socket GSL - jpeg6b + libjpeg IOJpeg diff --git a/par/jpeg_amr.th b/par/jpeg_amr.th index 336cfdc..4c16295 100644 --- a/par/jpeg_amr.th +++ b/par/jpeg_amr.th @@ -12,7 +12,7 @@ CactusConnect/HTTPDExtra CactusConnect/Socket CactusExternal/GSL -CactusExternal/jpeg6b +ExternalLibraries/libjpeg CactusIO/IOJpeg |