Changeset 29522
- Timestamp:
- Oct 22, 2010, 11:39:15 AM (16 years ago)
- Location:
- branches/eam_branches/ipp-20100823
- Files:
-
- 2 edited
-
ippconfig/recipes/jpeg.mdc (modified) (27 diffs)
-
psModules/src/camera/pmFPA_JPEG.c (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
branches/eam_branches/ipp-20100823/ippconfig/recipes/jpeg.mdc
r29514 r29522 5 5 # * SCALE.MIN: Minimum for scaling 6 6 # * SCALE.MAX: Maximum for scaling 7 # * OPTIONS: comma-separated list : -SB,+SB,+X,+Y,-X,-Y 7 8 8 9 PPIMAGE.JPEG1 METADATA … … 11 12 SCALE.MIN F32 -5.0 12 13 SCALE.MAX F32 +10.0 13 SCALE.BAR BOOL T14 OPTIONS STR +SB,-X,+Y 14 15 END 15 16 … … 19 20 SCALE.MIN F32 0.95 20 21 SCALE.MAX F32 1.05 21 SCALE.BAR BOOL F22 OPTIONS STR +SB,-X,+Y 22 23 END 23 24 … … 27 28 SCALE.MIN F32 -5.0 28 29 SCALE.MAX F32 +10.0 29 SCALE.BAR BOOL F30 OPTIONS STR -SB,-X,+Y 30 31 END 31 32 … … 35 36 SCALE.MIN F32 -8.0 36 37 SCALE.MAX F32 +8.0 37 SCALE.BAR BOOL T38 OPTIONS STR +SB,-X,+Y 38 39 END 39 40 … … 43 44 SCALE.MIN F32 -8.0 44 45 SCALE.MAX F32 +8.0 45 SCALE.BAR BOOL F46 OPTIONS STR -SB,-X,+Y 46 47 END 47 48 … … 51 52 SCALE.MIN F32 -8.0 52 53 SCALE.MAX F32 +8.0 53 SCALE.BAR BOOL T54 OPTIONS STR +SB,-X,+Y 54 55 END 55 56 … … 59 60 SCALE.MIN F32 -5.0 60 61 SCALE.MAX F32 +10.0 61 SCALE.BAR BOOL T62 OPTIONS STR +SB,-X,+Y 62 63 END 63 64 … … 67 68 SCALE.MIN F32 -5.0 68 69 SCALE.MAX F32 +10.0 69 SCALE.BAR BOOL F70 OPTIONS STR -SB,-X,+Y 70 71 END 71 72 … … 76 77 SCALE.MIN F32 -5.0 77 78 SCALE.MAX F32 +5.0 78 SCALE.BAR BOOL T79 OPTIONS STR +SB,-X,+Y 79 80 END 80 81 … … 84 85 SCALE.MIN F32 -5.0 85 86 SCALE.MAX F32 +5.0 86 SCALE.BAR BOOL F87 OPTIONS STR -SB,-X,+Y 87 88 END 88 89 END … … 95 96 SCALE.MIN F32 -5.0 96 97 SCALE.MAX F32 +5.0 97 SCALE.BAR BOOL T98 OPTIONS STR +SB,-X,+Y 98 99 END 99 100 … … 103 104 SCALE.MIN F32 -5.0 104 105 SCALE.MAX F32 +5.0 105 SCALE.BAR BOOL F106 OPTIONS STR -SB,-X,+Y 106 107 END 107 108 END … … 114 115 SCALE.MIN F32 -2.0 115 116 SCALE.MAX F32 +3.0 116 SCALE.BAR BOOL T117 OPTIONS STR +SB,-X,+Y 117 118 END 118 119 … … 122 123 SCALE.MIN F32 -2.0 123 124 SCALE.MAX F32 +3.0 124 SCALE.BAR BOOL F125 OPTIONS STR -SB,-X,+Y 125 126 END 126 127 END … … 133 134 SCALE.MIN F32 0.90 134 135 SCALE.MAX F32 1.10 135 SCALE.BAR BOOL T136 OPTIONS STR +SB,-X,+Y 136 137 END 137 138 … … 141 142 SCALE.MIN F32 0.95 142 143 SCALE.MAX F32 1.05 143 SCALE.BAR BOOL F144 OPTIONS STR -SB,-X,+Y 144 145 END 145 146 END … … 151 152 SCALE.MIN F32 -5.0 152 153 SCALE.MAX F32 +5.0 153 SCALE.BAR BOOL T154 END 155 156 PPIMAGE.JPEG2 METADATA 157 COLORMAP STR -greyscale 158 SCALE.MODE STR VALUE 159 SCALE.MIN F32 -5.0 160 SCALE.MAX F32 +5.0 161 SCALE.BAR BOOL F154 OPTIONS STR +SB,-X,+Y 155 END 156 157 PPIMAGE.JPEG2 METADATA 158 COLORMAP STR -greyscale 159 SCALE.MODE STR VALUE 160 SCALE.MIN F32 -5.0 161 SCALE.MAX F32 +5.0 162 OPTIONS STR -SB,-X,+Y 162 163 END 163 164 END … … 169 170 SCALE.MIN F32 0.99 170 171 SCALE.MAX F32 1.01 171 SCALE.BAR BOOL T172 OPTIONS STR +SB,-X,+Y 172 173 END 173 174 … … 177 178 SCALE.MIN F32 0.99 178 179 SCALE.MAX F32 1.01 179 SCALE.BAR BOOL F180 OPTIONS STR -SB,-X,+Y 180 181 END 181 182 END … … 188 189 SCALE.MIN F32 -2.0 189 190 SCALE.MAX F32 +3.0 190 SCALE.BAR BOOL T191 END 192 193 PPIMAGE.JPEG2 METADATA 194 COLORMAP STR -greyscale 195 SCALE.MODE STR RANGE 196 SCALE.MIN F32 -2.0 197 SCALE.MAX F32 +3.0 198 SCALE.BAR BOOL F191 OPTIONS STR +SB,-X,+Y 192 END 193 194 PPIMAGE.JPEG2 METADATA 195 COLORMAP STR -greyscale 196 SCALE.MODE STR RANGE 197 SCALE.MIN F32 -2.0 198 SCALE.MAX F32 +3.0 199 OPTIONS STR -SB,-X,+Y 199 200 END 200 201 END … … 206 207 SCALE.MIN F32 0.95 207 208 SCALE.MAX F32 1.05 208 SCALE.BAR BOOL T209 OPTIONS STR +SB,-X,+Y 209 210 END 210 211 … … 214 215 SCALE.MIN F32 0.95 215 216 SCALE.MAX F32 1.05 216 SCALE.BAR BOOL F217 OPTIONS STR -SB,-X,+Y 217 218 END 218 219 END … … 224 225 SCALE.MIN F32 0.0 225 226 SCALE.MAX F32 5.0 226 SCALE.BAR BOOL T227 OPTIONS STR +SB,-X,+Y 227 228 END 228 229 … … 232 233 SCALE.MIN F32 0.0 233 234 SCALE.MAX F32 5.0 234 SCALE.BAR BOOL F235 OPTIONS STR -SB,-X,+Y 235 236 END 236 237 END … … 242 243 SCALE.MIN F32 -8.0 243 244 SCALE.MAX F32 +8.0 244 SCALE.BAR BOOL T245 OPTIONS STR +SB,-X,+Y 245 246 END 246 247 … … 250 251 SCALE.MIN F32 -8.0 251 252 SCALE.MAX F32 +8.0 252 SCALE.BAR BOOL F253 END 254 253 OPTIONS STR -SB,-X,+Y 254 END 255 -
branches/eam_branches/ipp-20100823/psModules/src/camera/pmFPA_JPEG.c
r29514 r29522 179 179 psFree(stats); 180 180 181 // default options are: no flip in X or Y, scale bar on bottom 182 psImageJpegOptions *jpegOptions = psImageJpegOptionsAlloc(); 183 181 184 char *colormapName = psMetadataLookupStr(NULL, options, "COLORMAP"); // Name of colour map 182 185 if (!colormapName) { 183 186 colormapName = "-greyscale"; 184 187 } 188 psImageJpegColormapSet(jpegOptions, colormapName); 189 190 // set up the scale options 185 191 char *mode = psMetadataLookupStr(NULL, options, "SCALE.MODE"); // Mode for scaling image 186 192 if (!mode) { … … 195 201 fmax = +6.0; 196 202 } 197 bool haveBar = psMetadataLookupBool(&status, options, "SCALE.BAR"); // Mode for scaling image198 if (!status) {199 haveBar = false;200 }201 202 float min = 0, max = 0; // Minimum and maximum for stretch203 204 203 if (!strcasecmp(mode, "RANGE")) { 205 min = mean + fmin*delta;206 max = mean + fmax*delta;204 jpegOptions->min = mean + fmin*delta; 205 jpegOptions->max = mean + fmax*delta; 207 206 } else if (!strcasecmp(mode, "FRACTION")) { 208 min = fmin*mean;209 max = fmax*mean;207 jpegOptions->min = fmin*mean; 208 jpegOptions->max = fmax*mean; 210 209 } else if (!strcasecmp(mode, "VALUE")) { 211 212 max = fmax;210 jpegOptions->min = fmin; 211 jpegOptions->max = fmax; 213 212 } else { 214 213 psError(PS_ERR_BAD_PARAMETER_VALUE, true, "Unrecognised scaling mode: %s", mode); 215 214 return false; 216 215 } 217 218 if (!isfinite(min) || !isfinite(max)) { 216 if (!isfinite(jpegOptions->min) || !isfinite(jpegOptions->max)) { 219 217 psLogMsg("psModules.jpeg", PS_LOG_WARN, 220 218 "The stretch parameters are not both finite --- writing blank jpeg"); 221 min = 0; 222 max = 1; 223 } 224 225 psImageJpegOptions *jpegOptions = psImageJpegOptionsAlloc(); 226 psImageJpegColormapSet(jpegOptions, colormapName); 227 228 // default options are: no flip in X or Y, scale bar on bottom 229 jpegOptions->min = min; 230 jpegOptions->max = max; 231 232 if (haveBar) { 233 jpegOptions->showScale = PS_JPEG_SHOWSCALE_BOTTOM; 234 } else { 235 jpegOptions->showScale = PS_JPEG_SHOWSCALE_NONE; 219 jpegOptions->min = 0; 220 jpegOptions->max = 1; 221 } 222 223 jpegOptions->showScale = PS_JPEG_SHOWSCALE_NONE; 224 jpegOptions->xFlip = false; 225 jpegOptions->yFlip = false; 226 227 char *userOptions = psMetadataLookupStr(&status, options, "OPTIONS"); // Mode for scaling image 228 if (userOptions) { 229 // just use strstr for now 230 if (strcasestr(userOptions, "+SB")) { 231 jpegOptions->showScale = PS_JPEG_SHOWSCALE_BOTTOM; 232 } 233 if (strcasestr(userOptions, "-X")) { 234 jpegOptions->xFlip = true; 235 } 236 if (strcasestr(userOptions, "-Y")) { 237 jpegOptions->yFlip = true; 238 } 236 239 } 237 240
Note:
See TracChangeset
for help on using the changeset viewer.
