is a PDF viewer for X.
| JPXStream.h (xpdf-4.03) | : | JPXStream.h (xpdf-4.04) |
|---|
| | |
| skipping to change at line 205 | | skipping to change at line 205 |
|---|
| Guint codeBlockStyle; // code-block style | | Guint codeBlockStyle; // code-block style |
| Guint transform; // wavelet transformation | | Guint transform; // wavelet transformation |
| | |
| //----- from the QCD and QCC segments (main and tile) | | //----- from the QCD and QCC segments (main and tile) |
| Guint quantStyle; // quantization style | | Guint quantStyle; // quantization style |
| Guint *quantSteps; // quantization step size for each subband | | Guint *quantSteps; // quantization step size for each subband |
| Guint nQuantSteps; // number of entries in quantSteps | | Guint nQuantSteps; // number of entries in quantSteps |
| | |
| //----- computed | | //----- computed |
| Guint x0, y0, x1, y1; // bounds of the tile-comp, in ref coords | | Guint x0, y0, x1, y1; // bounds of the tile-comp, in ref coords |
|
| | Guint x0r, y0r; // x0 >> reduction, y0 >> reduction |
| Guint w, h; // data size = {x1 - x0, y1 - y0} >> reduction | | Guint w, h; // data size = {x1 - x0, y1 - y0} >> reduction |
| | |
| //----- image data | | //----- image data |
| int *data; // the decoded image data | | int *data; // the decoded image data |
| int *buf; // intermediate buffer for the inverse | | int *buf; // intermediate buffer for the inverse |
| // transform | | // transform |
| | |
| //----- children | | //----- children |
| JPXResLevel *resLevels; // the resolution levels | | JPXResLevel *resLevels; // the resolution levels |
| // (len = nDecompLevels + 1) | | // (len = nDecompLevels + 1) |
| | |
| skipping to change at line 231 | | skipping to change at line 232 |
|---|
| | |
| //----- from the COD segments (main and tile) | | //----- from the COD segments (main and tile) |
| Guint progOrder; // progression order | | Guint progOrder; // progression order |
| Guint nLayers; // number of layers | | Guint nLayers; // number of layers |
| Guint multiComp; // multiple component transformation | | Guint multiComp; // multiple component transformation |
| | |
| //----- computed | | //----- computed |
| Guint x0, y0, x1, y1; // bounds of the tile, in ref coords | | Guint x0, y0, x1, y1; // bounds of the tile, in ref coords |
| Guint maxNDecompLevels; // max number of decomposition levels used | | Guint maxNDecompLevels; // max number of decomposition levels used |
| // in any component in this tile | | // in any component in this tile |
|
| | Guint maxNPrecincts; // max number of precints in any |
| | // component/res level in this tile |
| | |
| //----- progression order loop counters | | //----- progression order loop counters |
| Guint comp; // component | | Guint comp; // component |
| Guint res; // resolution level | | Guint res; // resolution level |
| Guint precinct; // precinct | | Guint precinct; // precinct |
| Guint layer; // layer | | Guint layer; // layer |
| GBool done; // set when this tile is done | | GBool done; // set when this tile is done |
| | |
| //----- tile part info | | //----- tile part info |
| Guint nextTilePart; // next expected tile-part | | Guint nextTilePart; // next expected tile-part |
| | |
| skipping to change at line 297 | | skipping to change at line 300 |
|---|
| virtual int lookChar(); | | virtual int lookChar(); |
| virtual GString *getPSFilter(int psLevel, const char *indent, | | virtual GString *getPSFilter(int psLevel, const char *indent, |
| GBool okToReadStream); | | GBool okToReadStream); |
| virtual GBool isBinary(GBool last = gTrue); | | virtual GBool isBinary(GBool last = gTrue); |
| virtual void getImageParams(int *bitsPerComponent, | | virtual void getImageParams(int *bitsPerComponent, |
| StreamColorSpaceMode *csMode); | | StreamColorSpaceMode *csMode); |
| void reduceResolution(int reductionA) { reduction = reductionA; } | | void reduceResolution(int reductionA) { reduction = reductionA; } |
| | |
| private: | | private: |
| | |
|
| | void decodeImage(); |
| void fillReadBuf(); | | void fillReadBuf(); |
| void getImageParams2(int *bitsPerComponent, StreamColorSpaceMode *csMode); | | void getImageParams2(int *bitsPerComponent, StreamColorSpaceMode *csMode); |
| JPXDecodeResult readBoxes(); | | JPXDecodeResult readBoxes(); |
| GBool readColorSpecBox(Guint dataLen); | | GBool readColorSpecBox(Guint dataLen); |
| JPXDecodeResult readCodestream(Guint len); | | JPXDecodeResult readCodestream(Guint len); |
| GBool readTilePart(); | | GBool readTilePart(); |
| GBool readTilePartData(Guint tileIdx, | | GBool readTilePartData(Guint tileIdx, |
| Guint tilePartLen, GBool tilePartToEOC); | | Guint tilePartLen, GBool tilePartToEOC); |
| GBool readCodeBlockData(JPXTileComp *tileComp, | | GBool readCodeBlockData(JPXTileComp *tileComp, |
| JPXResLevel *resLevel, | | JPXResLevel *resLevel, |
| | |
| skipping to change at line 332 | | skipping to change at line 336 |
|---|
| GBool readULong(Guint *x); | | GBool readULong(Guint *x); |
| GBool readNBytes(int nBytes, GBool signd, int *x); | | GBool readNBytes(int nBytes, GBool signd, int *x); |
| void startBitBuf(Guint byteCountA); | | void startBitBuf(Guint byteCountA); |
| GBool readBits(int nBits, Guint *x); | | GBool readBits(int nBits, Guint *x); |
| void skipSOP(); | | void skipSOP(); |
| void skipEPH(); | | void skipEPH(); |
| Guint finishBitBuf(); | | Guint finishBitBuf(); |
| | |
| BufStream *bufStr; // buffered stream (for lookahead) | | BufStream *bufStr; // buffered stream (for lookahead) |
| | |
|
| | GBool decoded; // set when the image has been decoded |
| Guint nComps; // number of components | | Guint nComps; // number of components |
| Guint *bpc; // bits per component, for each component | | Guint *bpc; // bits per component, for each component |
| Guint width, height; // image size | | Guint width, height; // image size |
| int reduction; // log2(reduction in resolution) | | int reduction; // log2(reduction in resolution) |
| GBool haveImgHdr; // set if a JP2/JPX image header has been | | GBool haveImgHdr; // set if a JP2/JPX image header has been |
| // found | | // found |
| JPXColorSpec cs; // color specification | | JPXColorSpec cs; // color specification |
| GBool haveCS; // set if a color spec has been found | | GBool haveCS; // set if a color spec has been found |
| JPXPalette palette; // the palette | | JPXPalette palette; // the palette |
| GBool havePalette; // set if a palette has been found | | GBool havePalette; // set if a palette has been found |
| | | |
| End of changes. 4 change blocks. |
|---|
| 0 lines changed or deleted | | 5 lines changed or added |
|---|
"Fossies" - the Fresh Open Source Software Archive 