] [on|off] ...", "Specifies in which tiles to use a multiple component transform. " + "Note that this multiple component transform can only be applied " + "in tiles that contain at least three components and whose " + "components are processed with the same wavelet filters and " + "quantization type. " + "If the wavelet transform is reversible (w5x3 filter), the " + "Reversible Component Transformation (RCT) is applied. If not " + "(w9x7 filter), the Irreversible Component Transformation (ICT)" + " is used.", null } };
-
- /// Returns the position of the fixed point in the specified
- /// component. This is the position of the least significant integral
- /// (i.e. non-fractional) bit, which is equivalent to the number of
- /// fractional bits. For instance, for fixed-point values with 2 fractional
- /// bits, 2 is returned. For floating-point data this value does not apply
- /// and 0 should be returned. Position 0 is the position of the least
- /// significant bit in the data.
- ///
- /// This default implementation assumes that the number of fractional
- /// bits is not modified by the component mixer.
- ///
- ///
- /// The index of the component.
- ///
- ///
- /// The value of the fixed point position of the source since the
- /// color transform does not affect it.
- ///
- ///
- public virtual int getFixedPoint(int c)
- {
- return src.getFixedPoint(c);
- }
-
- /// Calculates the bitdepths of the transformed components, given the
- /// bitdepth of the un-transformed components and the component
- /// transformation type.
- ///
- ///
- /// The bitdepth of each non-transformed components.
- ///
- ///
- /// The type ID of the component transformation.
- ///
- ///
- /// If not null the results are stored in this array,
- /// otherwise a new array is allocated and returned.
- ///
- ///
- /// The bitdepth of each transformed component.
- ///
- ///
- public static int[] calcMixedBitDepths(int[] ntdepth, int ttype, int[] tdepth)
- {
-
- if (ntdepth.Length < 3 && ttype != NONE)
- {
- throw new System.ArgumentException();
- }
-
- if (tdepth == null)
- {
- tdepth = new int[ntdepth.Length];
- }
-
- switch (ttype)
- {
-
- case NONE:
- Array.Copy(ntdepth, 0, tdepth, 0, ntdepth.Length);
- break;
-
- case FORW_RCT:
- if (ntdepth.Length > 3)
- {
- Array.Copy(ntdepth, 3, tdepth, 3, ntdepth.Length - 3);
- }
- // The formulas are:
- // tdepth[0] = ceil(log2(2^(ntdepth[0])+2^ntdepth[1]+
- // 2^(ntdepth[2])))-2+1
- // tdepth[1] = ceil(log2(2^(ntdepth[1])+2^(ntdepth[2])-1))+1
- // tdepth[2] = ceil(log2(2^(ntdepth[0])+2^(ntdepth[1])-1))+1
- // The MathUtil.log2(x) function calculates floor(log2(x)), so we
- // use 'MathUtil.log2(2*x-1)+1', which calculates ceil(log2(x))
- // for any x>=1, x integer.
- tdepth[0] = MathUtil.log2((1 << ntdepth[0]) + (2 << ntdepth[1]) + (1 << ntdepth[2]) - 1) - 2 + 1;
- tdepth[1] = MathUtil.log2((1 << ntdepth[2]) + (1 << ntdepth[1]) - 1) + 1;
- tdepth[2] = MathUtil.log2((1 << ntdepth[0]) + (1 << ntdepth[1]) - 1) + 1;
- break;
-
- case FORW_ICT:
- if (ntdepth.Length > 3)
- {
- Array.Copy(ntdepth, 3, tdepth, 3, ntdepth.Length - 3);
- }
- // The MathUtil.log2(x) function calculates floor(log2(x)), so we
- // use 'MathUtil.log2(2*x-1)+1', which calculates ceil(log2(x))
- // for any x>=1, x integer.
- //UPGRADE_WARNING: Data types in Visual C# might be different. Verify the accuracy of narrowing conversions. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1042'"
- tdepth[0] = MathUtil.log2((int)System.Math.Floor((1 << ntdepth[0]) * 0.299072 + (1 << ntdepth[1]) * 0.586914 + (1 << ntdepth[2]) * 0.114014) - 1) + 1;
- //UPGRADE_WARNING: Data types in Visual C# might be different. Verify the accuracy of narrowing conversions. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1042'"
- tdepth[1] = MathUtil.log2((int)System.Math.Floor((1 << ntdepth[0]) * 0.168701 + (1 << ntdepth[1]) * 0.331299 + (1 << ntdepth[2]) * 0.5) - 1) + 1;
- //UPGRADE_WARNING: Data types in Visual C# might be different. Verify the accuracy of narrowing conversions. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1042'"
- tdepth[2] = MathUtil.log2((int)System.Math.Floor((1 << ntdepth[0]) * 0.5 + (1 << ntdepth[1]) * 0.418701 + (1 << ntdepth[2]) * 0.081299) - 1) + 1;
- break;
- }
-
- return tdepth;
- }
-
- /// Initialize some variables used with RCT. It must be called, at least,
- /// at the beginning of each new tile.
- ///
- ///
- private void initForwRCT()
- {
- int i;
- int tIdx = TileIdx;
-
- if (src.NumComps < 3)
- {
- throw new System.ArgumentException();
- }
- // Check that the 3 components have the same dimensions
- if (src.getTileCompWidth(tIdx, 0) != src.getTileCompWidth(tIdx, 1) || src.getTileCompWidth(tIdx, 0) != src.getTileCompWidth(tIdx, 2) || src.getTileCompHeight(tIdx, 0) != src.getTileCompHeight(tIdx, 1) || src.getTileCompHeight(tIdx, 0) != src.getTileCompHeight(tIdx, 2))
- {
- throw new System.ArgumentException("Can not use RCT " + "on components with different " + "dimensions");
- }
- // Initialize bitdepths
- int[] utd; // Premix bitdepths
- utd = new int[src.NumComps];
- for (i = utd.Length - 1; i >= 0; i--)
- {
- utd[i] = src.getNomRangeBits(i);
- }
- tdepth = calcMixedBitDepths(utd, FORW_RCT, null);
- }
-
- /// Initialize some variables used with ICT. It must be called, at least,
- /// at the beginning of a new tile.
- ///
- ///
- private void initForwICT()
- {
- int i;
- int tIdx = TileIdx;
-
- if (src.NumComps < 3)
- {
- throw new System.ArgumentException();
- }
- // Check that the 3 components have the same dimensions
- if (src.getTileCompWidth(tIdx, 0) != src.getTileCompWidth(tIdx, 1) || src.getTileCompWidth(tIdx, 0) != src.getTileCompWidth(tIdx, 2) || src.getTileCompHeight(tIdx, 0) != src.getTileCompHeight(tIdx, 1) || src.getTileCompHeight(tIdx, 0) != src.getTileCompHeight(tIdx, 2))
- {
- throw new System.ArgumentException("Can not use ICT " + "on components with different " + "dimensions");
- }
- // Initialize bitdepths
- int[] utd; // Premix bitdepths
- utd = new int[src.NumComps];
- for (i = utd.Length - 1; i >= 0; i--)
- {
- utd[i] = src.getNomRangeBits(i);
- }
- tdepth = calcMixedBitDepths(utd, FORW_ICT, null);
- }
-
- /// Returns a string with a descriptive text of which forward component
- /// transformation is used. This can be either "Forward RCT" or "Forward
- /// ICT" or "No component transformation" depending on the current tile.
- ///
- ///
- /// A descriptive string
- ///
- ///
- public override System.String ToString()
- {
- switch (transfType)
- {
-
- case FORW_RCT:
- return "Forward RCT";
-
- case FORW_ICT:
- return "Forward ICT";
-
- case NONE:
- return "No component transformation";
-
- default:
- throw new System.ArgumentException("Non JPEG 2000 part I" + " component transformation");
-
- }
- }
-
- /// Returns the number of bits, referred to as the "range bits",
- /// corresponding to the nominal range of the data in the specified
- /// component and in the current tile. If this number is b then for
- /// unsigned data the nominal range is between 0 and 2^b-1, and for signed
- /// data it is between -2^(b-1) and 2^(b-1)-1. Note that this value can be
- /// affected by the multiple component transform.
- ///
- ///
- /// The index of the component.
- ///
- ///
- /// The bitdepth of component 'c' after mixing.
- ///
- ///
- public override int getNomRangeBits(int c)
- {
- switch (transfType)
- {
-
- case FORW_RCT:
- case FORW_ICT:
- return tdepth[c];
-
- case NONE:
- return src.getNomRangeBits(c);
-
- default:
- throw new System.ArgumentException("Non JPEG 2000 part I" + " component transformation");
-
- }
- }
-
- /// Apply forward component transformation associated with the current
- /// tile. If no component transformation has been requested by the user,
- /// data are not modified.
- ///
- /// This method calls the getInternCompData() method, but respects the
- /// definitions of the getCompData() method defined in the BlkImgDataSrc
- /// interface.
- ///
- ///
- /// Determines the rectangular area to return, and the data is
- /// returned in this object.
- ///
- ///
- /// Index of the output component.
- ///
- ///
- /// The requested DataBlk
- ///
- ///
- ///
- ///
- ///
- public virtual DataBlk getCompData(DataBlk blk, int c)
- {
- // If requesting a component whose index is greater than 3 or there is
- // no transform return a copy of data (getInternCompData returns the
- // actual data in those cases)
- if (c >= 3 || transfType == NONE)
- {
- return src.getCompData(blk, c);
- }
- else
- {
- // We can use getInternCompData (since data is a copy anyways)
- return getInternCompData(blk, c);
- }
- }
-
- /// Apply the component transformation associated with the current tile. If
- /// no component transformation has been requested by the user, data are
- /// not modified. Else, appropriate method is called (forwRCT or forwICT).
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- /// Determines the rectangular area to return.
- ///
- ///
- /// Index of the output component.
- ///
- ///
- /// The requested DataBlk
- ///
- ///
- public virtual DataBlk getInternCompData(DataBlk blk, int c)
- {
- switch (transfType)
- {
-
- case NONE:
- return src.getInternCompData(blk, c);
-
- case FORW_RCT:
- return forwRCT(blk, c);
-
- case FORW_ICT:
- return forwICT(blk, c);
-
- default:
- throw new System.ArgumentException("Non JPEG 2000 part 1 " + "component" + " transformation for tile: " + tIdx);
-
- }
- }
-
- /// Apply forward component transformation to obtain requested component
- /// from specified block of data. Whatever the type of requested DataBlk,
- /// it always returns a DataBlkInt.
- ///
- ///
- /// Determine the rectangular area to return
- ///
- ///
- /// The index of the requested component
- ///
- ///
- /// Data of requested component
- ///
- ///
- private DataBlk forwRCT(DataBlk blk, int c)
- {
- int k, k0, k1, k2, mink, i;
- int w = blk.w; //width of output block
- int h = blk.h; //height of ouput block
- int[] outdata; //array of output data
-
- //If asking for Yr, Ur or Vr do transform
- if (c >= 0 && c <= 2)
- {
- // Check that request data type is int
- if (blk.DataType != DataBlk.TYPE_INT)
- {
- if (outBlk == null || outBlk.DataType != DataBlk.TYPE_INT)
- {
- outBlk = new DataBlkInt();
- }
- outBlk.w = w;
- outBlk.h = h;
- outBlk.ulx = blk.ulx;
- outBlk.uly = blk.uly;
- blk = outBlk;
- }
-
- //Reference to output block data array
- outdata = (int[])blk.Data;
-
- //Create data array of blk if necessary
- if (outdata == null || outdata.Length < h * w)
- {
- outdata = new int[h * w];
- blk.Data = outdata;
- }
-
- // Block buffers for input RGB data
- int[] data0, data1, bdata; // input data arrays
-
- if (block0 == null)
- block0 = new DataBlkInt();
- if (block1 == null)
- block1 = new DataBlkInt();
- if (block2 == null)
- block2 = new DataBlkInt();
- block0.w = block1.w = block2.w = blk.w;
- block0.h = block1.h = block2.h = blk.h;
- block0.ulx = block1.ulx = block2.ulx = blk.ulx;
- block0.uly = block1.uly = block2.uly = blk.uly;
-
- //Fill in buffer blocks (to be read only)
- // Returned blocks may have different size and position
- block0 = (DataBlkInt)src.getInternCompData(block0, 0);
- data0 = (int[])block0.Data;
- block1 = (DataBlkInt)src.getInternCompData(block1, 1);
- data1 = (int[])block1.Data;
- block2 = (DataBlkInt)src.getInternCompData(block2, 2);
- bdata = (int[])block2.Data;
-
- // Set the progressiveness of the output data
- blk.progressive = block0.progressive || block1.progressive || block2.progressive;
- blk.offset = 0;
- blk.scanw = w;
-
- //Perform conversion
-
- // Initialize general indexes
- k = w * h - 1;
- k0 = block0.offset + (h - 1) * block0.scanw + w - 1;
- k1 = block1.offset + (h - 1) * block1.scanw + w - 1;
- k2 = block2.offset + (h - 1) * block2.scanw + w - 1;
-
- switch (c)
- {
-
- case 0: //RGB to Yr conversion
- for (i = h - 1; i >= 0; i--)
- {
- for (mink = k - w; k > mink; k--, k0--, k1--, k2--)
- {
- // Use int arithmetic with 12 fractional bits
- // and rounding
- outdata[k] = (data0[k] + 2 * data1[k] + bdata[k]) >> 2; // Same as / 4
- }
- // Jump to beggining of previous line in input
- k0 -= (block0.scanw - w);
- k1 -= (block1.scanw - w);
- k2 -= (block2.scanw - w);
- }
- break;
-
-
- case 1: //RGB to Ur conversion
- for (i = h - 1; i >= 0; i--)
- {
- for (mink = k - w; k > mink; k--, k1--, k2--)
- {
- // Use int arithmetic with 12 fractional bits
- // and rounding
- outdata[k] = bdata[k2] - data1[k1];
- }
- // Jump to beggining of previous line in input
- k1 -= (block1.scanw - w);
- k2 -= (block2.scanw - w);
- }
- break;
-
-
- case 2: //RGB to Vr conversion
- for (i = h - 1; i >= 0; i--)
- {
- for (mink = k - w; k > mink; k--, k0--, k1--)
- {
- // Use int arithmetic with 12 fractional bits
- // and rounding
- outdata[k] = data0[k0] - data1[k1];
- }
- // Jump to beggining of previous line in input
- k0 -= (block0.scanw - w);
- k1 -= (block1.scanw - w);
- }
- break;
- }
- }
- else if (c >= 3)
- {
- // Requesting a component which is not Y, Ur or Vr =>
- // just pass the data
- return src.getInternCompData(blk, c);
- }
- else
- {
- // Requesting a non valid component index
- throw new System.ArgumentException();
- }
- return blk;
- }
-
- /// Apply forward irreversible component transformation to obtain requested
- /// component from specified block of data. Whatever the type of requested
- /// DataBlk, it always returns a DataBlkFloat.
- ///
- ///
- /// Determine the rectangular area to return
- ///
- ///
- /// The index of the requested component
- ///
- ///
- /// Data of requested component
- ///
- ///
- private DataBlk forwICT(DataBlk blk, int c)
- {
- int k, k0, k1, k2, mink, i;
- int w = blk.w; //width of output block
- int h = blk.h; //height of ouput block
- float[] outdata; //array of output data
-
- if (blk.DataType != DataBlk.TYPE_FLOAT)
- {
- if (outBlk == null || outBlk.DataType != DataBlk.TYPE_FLOAT)
- {
- outBlk = new DataBlkFloat();
- }
- outBlk.w = w;
- outBlk.h = h;
- outBlk.ulx = blk.ulx;
- outBlk.uly = blk.uly;
- blk = outBlk;
- }
-
- //Reference to output block data array
- outdata = (float[])blk.Data;
-
- //Create data array of blk if necessary
- if (outdata == null || outdata.Length < w * h)
- {
- outdata = new float[h * w];
- blk.Data = outdata;
- }
-
- //If asking for Y, Cb or Cr do transform
- if (c >= 0 && c <= 2)
- {
-
- int[] data0, data1, data2; // input data arrays
-
- if (block0 == null)
- {
- block0 = new DataBlkInt();
- }
- if (block1 == null)
- {
- block1 = new DataBlkInt();
- }
- if (block2 == null)
- {
- block2 = new DataBlkInt();
- }
- block0.w = block1.w = block2.w = blk.w;
- block0.h = block1.h = block2.h = blk.h;
- block0.ulx = block1.ulx = block2.ulx = blk.ulx;
- block0.uly = block1.uly = block2.uly = blk.uly;
-
- // Returned blocks may have different size and position
- block0 = (DataBlkInt)src.getInternCompData(block0, 0);
- data0 = (int[])block0.Data;
- block1 = (DataBlkInt)src.getInternCompData(block1, 1);
- data1 = (int[])block1.Data;
- block2 = (DataBlkInt)src.getInternCompData(block2, 2);
- data2 = (int[])block2.Data;
-
- // Set the progressiveness of the output data
- blk.progressive = block0.progressive || block1.progressive || block2.progressive;
- blk.offset = 0;
- blk.scanw = w;
-
- //Perform conversion
-
- // Initialize general indexes
- k = w * h - 1;
- k0 = block0.offset + (h - 1) * block0.scanw + w - 1;
- k1 = block1.offset + (h - 1) * block1.scanw + w - 1;
- k2 = block2.offset + (h - 1) * block2.scanw + w - 1;
-
- switch (c)
- {
-
- case 0:
- //RGB to Y conversion
- for (i = h - 1; i >= 0; i--)
- {
- for (mink = k - w; k > mink; k--, k0--, k1--, k2--)
- {
- outdata[k] = 0.299f * data0[k0] + 0.587f * data1[k1] + 0.114f * data2[k2];
- }
- // Jump to beggining of previous line in input
- k0 -= (block0.scanw - w);
- k1 -= (block1.scanw - w);
- k2 -= (block2.scanw - w);
- }
- break;
-
-
- case 1:
- //RGB to Cb conversion
- for (i = h - 1; i >= 0; i--)
- {
- for (mink = k - w; k > mink; k--, k0--, k1--, k2--)
- {
- outdata[k] = (-0.16875f) * data0[k0] - 0.33126f * data1[k1] + 0.5f * data2[k2];
- }
- // Jump to beggining of previous line in input
- k0 -= (block0.scanw - w);
- k1 -= (block1.scanw - w);
- k2 -= (block2.scanw - w);
- }
- break;
-
-
- case 2:
- //RGB to Cr conversion
- for (i = h - 1; i >= 0; i--)
- {
- for (mink = k - w; k > mink; k--, k0--, k1--, k2--)
- {
- outdata[k] = 0.5f * data0[k0] - 0.41869f * data1[k1] - 0.08131f * data2[k2];
- }
- // Jump to beggining of previous line in input
- k0 -= (block0.scanw - w);
- k1 -= (block1.scanw - w);
- k2 -= (block2.scanw - w);
- }
- break;
- }
- }
- else if (c >= 3)
- {
- // Requesting a component which is not Y, Cb or Cr =>
- // just pass the data
-
- // Variables
- DataBlkInt indb = new DataBlkInt(blk.ulx, blk.uly, w, h);
- int[] indata; // input data array
-
- // Get the input data
- // (returned block may be larger than requested one)
- src.getInternCompData(indb, c);
- indata = (int[])indb.Data;
-
- // Copy the data converting from int to float
- k = w * h - 1;
- k0 = indb.offset + (h - 1) * indb.scanw + w - 1;
- for (i = h - 1; i >= 0; i--)
- {
- for (mink = k - w; k > mink; k--, k0--)
- {
- //UPGRADE_WARNING: Data types in Visual C# might be different. Verify the accuracy of narrowing conversions. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1042'"
- outdata[k] = (float)indata[k0];
- }
- // Jump to beggining of next line in input
- k0 += indb.w - w;
- }
-
- // Set the progressivity
- blk.progressive = indb.progressive;
- blk.offset = 0;
- blk.scanw = w;
- return blk;
- }
- else
- {
- // Requesting a non valid component index
- throw new System.ArgumentException();
- }
- return blk;
- }
-
- /// Changes the current tile, given the new indexes. An
- /// IllegalArgumentException is thrown if the indexes do not correspond to
- /// a valid tile.
- ///
- /// This default implementation changes the tile in the source and
- /// re-initializes properly component transformation variables..
- ///
- ///
- /// The horizontal index of the tile.
- ///
- ///
- /// The vertical index of the new tile.
- ///
- ///
- public override void setTile(int x, int y)
- {
- src.setTile(x, y);
- tIdx = TileIdx; // index of the current tile
-
- // initializations
- System.String str = (System.String)cts.getTileDef(tIdx);
- if (str.Equals("none"))
- {
- transfType = NONE;
- }
- else if (str.Equals("rct"))
- {
- transfType = FORW_RCT;
- initForwRCT();
- }
- else if (str.Equals("ict"))
- {
- transfType = FORW_ICT;
- initForwICT();
- }
- else
- {
- throw new System.ArgumentException("Component transformation" + " not recognized");
- }
- }
-
- /// Goes to the next tile, in standard scan-line order (by rows then by
- /// columns). An NoNextElementException is thrown if the current tile is
- /// the last one (i.e. there is no next tile).
- ///
- /// This default implementation just advances to the next tile in the
- /// source and re-initializes properly component transformation
- /// variables.
- ///
- ///
- public override void nextTile()
- {
- src.nextTile();
- tIdx = TileIdx; // index of the current tile
-
- // initializations
- System.String str = (System.String)cts.getTileDef(tIdx);
- if (str.Equals("none"))
- {
- transfType = NONE;
- }
- else if (str.Equals("rct"))
- {
- transfType = FORW_RCT;
- initForwRCT();
- }
- else if (str.Equals("ict"))
- {
- transfType = FORW_ICT;
- initForwICT();
- }
- else
- {
- throw new System.ArgumentException("Component transformation" + " not recognized");
- }
- }
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/image/forwcomptransf/ForwCompTransfSpec.cs b/CSJ2K/j2k/image/forwcomptransf/ForwCompTransfSpec.cs
deleted file mode 100644
index 882a15e0..00000000
--- a/CSJ2K/j2k/image/forwcomptransf/ForwCompTransfSpec.cs
+++ /dev/null
@@ -1,438 +0,0 @@
-/*
-* CVS identifier:
-*
-* $Id: ForwCompTransfSpec.java,v 1.7 2001/05/08 16:10:18 grosbois Exp $
-*
-* Class: ForwCompTransfSpec
-*
-* Description: Component Transformation specification for encoder
-*
-*
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-* */
-using CSJ2K.j2k.util;
-using CSJ2K.j2k.wavelet;
-using CSJ2K.j2k.wavelet.analysis;
-namespace CSJ2K.j2k.image.forwcomptransf
-{
-
- /// This class extends CompTransfSpec class in order to hold encoder specific
- /// aspects of CompTransfSpec.
- ///
- ///
- ///
- ///
- ///
- public class ForwCompTransfSpec : CompTransfSpec, FilterTypes
- {
- /// Constructs a new 'ForwCompTransfSpec' for the specified number of
- /// components and tiles, the wavelet filters type and the parameter of the
- /// option 'Mct'. This constructor is called by the encoder. It also checks
- /// that the arguments belong to the recognized arguments list.
- ///
- /// This constructor chose the component transformation type depending
- /// on the wavelet filters : RCT with w5x3 filter and ICT with w9x7
- /// filter. Note: All filters must use the same data type.
- ///
- ///
- /// The number of tiles
- ///
- ///
- /// The number of components
- ///
- ///
- /// the type of the specification module i.e. tile specific,
- /// component specific or both.
- ///
- ///
- /// The wavelet filter specifications
- ///
- ///
- /// The ParameterList
- ///
- ///
- public ForwCompTransfSpec(int nt, int nc, byte type, AnWTFilterSpec wfs, ParameterList pl) : base(nt, nc, type)
- {
-
- System.String param = pl.getParameter("Mct");
-
- if (param == null)
- {
- // The option has not been specified
-
- // If less than three component, do not use any component
- // transformation
- if (nc < 3)
- {
- setDefault("none");
- return;
- }
- // If the compression is lossless, uses RCT
- else if (pl.getBooleanParameter("lossless"))
- {
- setDefault("rct");
- return;
- }
- else
- {
- AnWTFilter[][] anfilt;
- int[] filtType = new int[nComp];
- for (int c = 0; c < 3; c++)
- {
- anfilt = (AnWTFilter[][])wfs.getCompDef(c);
- filtType[c] = anfilt[0][0].FilterType;
- }
-
- // Check that the three first components use the same filters
- bool reject = false;
- for (int c = 1; c < 3; c++)
- {
- if (filtType[c] != filtType[0])
- reject = true;
- }
-
- if (reject)
- {
- setDefault("none");
- }
- else
- {
- anfilt = (AnWTFilter[][])wfs.getCompDef(0);
- if (anfilt[0][0].FilterType == CSJ2K.j2k.wavelet.FilterTypes_Fields.W9X7)
- {
- setDefault("ict");
- }
- else
- {
- setDefault("rct");
- }
- }
- }
-
- // Each tile receives a component transform specification
- // according the type of wavelet filters that are used by the
- // three first components
- for (int t = 0; t < nt; t++)
- {
- AnWTFilter[][] anfilt;
- int[] filtType = new int[nComp];
- for (int c = 0; c < 3; c++)
- {
- anfilt = (AnWTFilter[][])wfs.getTileCompVal(t, c);
- filtType[c] = anfilt[0][0].FilterType;
- }
-
- // Check that the three components use the same filters
- bool reject = false;
- for (int c = 1; c < nComp; c++)
- {
- if (filtType[c] != filtType[0])
- reject = true;
- }
-
- if (reject)
- {
- setTileDef(t, "none");
- }
- else
- {
- anfilt = (AnWTFilter[][])wfs.getTileCompVal(t, 0);
- if (anfilt[0][0].FilterType == CSJ2K.j2k.wavelet.FilterTypes_Fields.W9X7)
- {
- setTileDef(t, "ict");
- }
- else
- {
- setTileDef(t, "rct");
- }
- }
- }
- return;
- }
-
- // Parse argument
- SupportClass.Tokenizer stk = new SupportClass.Tokenizer(param);
- System.String word; // current word
- byte curSpecType = SPEC_DEF; // Specification type of the
- // current parameter
- bool[] tileSpec = null; // Tiles concerned by the
- // specification
- //System.Boolean value_Renamed;
-
- while (stk.HasMoreTokens())
- {
- word = stk.NextToken();
-
- switch (word[0])
- {
-
- case 't': // Tiles specification
- tileSpec = parseIdx(word, nTiles);
- if (curSpecType == SPEC_COMP_DEF)
- {
- curSpecType = SPEC_TILE_COMP;
- }
- else
- {
- curSpecType = SPEC_TILE_DEF;
- }
- break;
-
- case 'c': // Components specification
- throw new System.ArgumentException("Component specific " + " parameters" + " not allowed with " + "'-Mct' option");
-
- default:
- if (word.Equals("off"))
- {
- if (curSpecType == SPEC_DEF)
- {
- setDefault("none");
- }
- else if (curSpecType == SPEC_TILE_DEF)
- {
- for (int i = tileSpec.Length - 1; i >= 0; i--)
- if (tileSpec[i])
- {
- setTileDef(i, "none");
- }
- }
- }
- else if (word.Equals("on"))
- {
- if (nc < 3)
- {
- throw new System.ArgumentException("Cannot use component" + " transformation on a " + "image with less than " + "three components");
- }
-
- if (curSpecType == SPEC_DEF)
- {
- // Set arbitrarily the default
- // value to RCT (later will be found the suitable
- // component transform for each tile)
- setDefault("rct");
- }
- else if (curSpecType == SPEC_TILE_DEF)
- {
- for (int i = tileSpec.Length - 1; i >= 0; i--)
- {
- if (tileSpec[i])
- {
- if (getFilterType(i, wfs) == CSJ2K.j2k.wavelet.FilterTypes_Fields.W5X3)
- {
- setTileDef(i, "rct");
- }
- else
- {
- setTileDef(i, "ict");
- }
- }
- }
- }
- }
- else
- {
- throw new System.ArgumentException("Default parameter of " + "option Mct not" + " recognized: " + param);
- }
-
- // Re-initialize
- curSpecType = SPEC_DEF;
- tileSpec = null;
- break;
-
- }
- }
-
- // Check that default value has been specified
- if (getDefault() == null)
- {
- // If not, set arbitrarily the default value to 'none' but
- // specifies explicitely a default value for each tile depending
- // on the wavelet transform that is used
- setDefault("none");
-
- for (int t = 0; t < nt; t++)
- {
- if (isTileSpecified(t))
- {
- continue;
- }
-
- AnWTFilter[][] anfilt;
- int[] filtType = new int[nComp];
- for (int c = 0; c < 3; c++)
- {
- anfilt = (AnWTFilter[][])wfs.getTileCompVal(t, c);
- filtType[c] = anfilt[0][0].FilterType;
- }
-
- // Check that the three components use the same filters
- bool reject = false;
- for (int c = 1; c < nComp; c++)
- {
- if (filtType[c] != filtType[0])
- reject = true;
- }
-
- if (reject)
- {
- setTileDef(t, "none");
- }
- else
- {
- anfilt = (AnWTFilter[][])wfs.getTileCompVal(t, 0);
- if (anfilt[0][0].FilterType == CSJ2K.j2k.wavelet.FilterTypes_Fields.W9X7)
- {
- setTileDef(t, "ict");
- }
- else
- {
- setTileDef(t, "rct");
- }
- }
- }
- }
-
- // Check validity of component transformation of each tile compared to
- // the filter used.
- for (int t = nt - 1; t >= 0; t--)
- {
-
- if (((System.String)getTileDef(t)).Equals("none"))
- {
- // No comp. transf is used. No check is needed
- continue;
- }
- else if (((System.String)getTileDef(t)).Equals("rct"))
- {
- // Tile is using Reversible component transform
- int filterType = getFilterType(t, wfs);
- switch (filterType)
- {
-
- case CSJ2K.j2k.wavelet.FilterTypes_Fields.W5X3: // OK
- break;
-
- case CSJ2K.j2k.wavelet.FilterTypes_Fields.W9X7: // Must use ICT
- if (isTileSpecified(t))
- {
- // User has requested RCT -> Error
- throw new System.ArgumentException("Cannot use RCT " + "with 9x7 filter " + "in tile " + t);
- }
- else
- {
- // Specify ICT for this tile
- setTileDef(t, "ict");
- }
- break;
-
- default:
- throw new System.ArgumentException("Default filter is " + "not JPEG 2000 part" + " I compliant");
-
- }
- }
- else
- {
- // ICT
- int filterType = getFilterType(t, wfs);
- switch (filterType)
- {
-
- case CSJ2K.j2k.wavelet.FilterTypes_Fields.W5X3: // Must use RCT
- if (isTileSpecified(t))
- {
- // User has requested ICT -> Error
- throw new System.ArgumentException("Cannot use ICT " + "with filter 5x3 " + "in tile " + t);
- }
- else
- {
- setTileDef(t, "rct");
- }
- break;
-
- case CSJ2K.j2k.wavelet.FilterTypes_Fields.W9X7: // OK
- break;
-
- default:
- throw new System.ArgumentException("Default filter is " + "not JPEG 2000 part" + " I compliant");
-
- }
- }
- }
- }
-
- /// Get the filter type common to all component of a given tile. If the
- /// tile index is -1, it searches common filter type of default
- /// specifications.
- ///
- ///
- /// The tile index
- ///
- ///
- /// The analysis filters specifications
- ///
- ///
- /// The filter type common to all the components
- ///
- ///
- private int getFilterType(int t, AnWTFilterSpec wfs)
- {
- AnWTFilter[][] anfilt;
- int[] filtType = new int[nComp];
- for (int c = 0; c < nComp; c++)
- {
- if (t == -1)
- {
- anfilt = (AnWTFilter[][])wfs.getCompDef(c);
- }
- else
- {
- anfilt = (AnWTFilter[][])wfs.getTileCompVal(t, c);
- }
- filtType[c] = anfilt[0][0].FilterType;
- }
-
- // Check that all filters are the same one
- bool reject = false;
- for (int c = 1; c < nComp; c++)
- {
- if (filtType[c] != filtType[0])
- reject = true;
- }
- if (reject)
- {
- throw new System.ArgumentException("Can not use component" + " transformation when " + "components do not use " + "the same filters");
- }
- return filtType[0];
- }
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/image/input/ImgReader.cs b/CSJ2K/j2k/image/input/ImgReader.cs
deleted file mode 100644
index d6e27c98..00000000
--- a/CSJ2K/j2k/image/input/ImgReader.cs
+++ /dev/null
@@ -1,507 +0,0 @@
-/// CVS identifier:
-///
-/// $Id: ImgReader.java,v 1.10 2002/07/25 15:07:44 grosbois Exp $
-///
-/// Class: ImgReader
-///
-/// Description: Generic interface for image readers (from
-/// file or other resource)
-///
-///
-///
-/// COPYRIGHT:
-///
-/// This software module was originally developed by Raphaël Grosbois and
-/// Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-/// Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-/// Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-/// Centre France S.A) in the course of development of the JPEG2000
-/// standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-/// software module is an implementation of a part of the JPEG 2000
-/// Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-/// Systems AB and Canon Research Centre France S.A (collectively JJ2000
-/// Partners) agree not to assert against ISO/IEC and users of the JPEG
-/// 2000 Standard (Users) any of their rights under the copyright, not
-/// including other intellectual property rights, for this software module
-/// with respect to the usage by ISO/IEC and Users of this software module
-/// or modifications thereof for use in hardware or software products
-/// claiming conformance to the JPEG 2000 Standard. Those intending to use
-/// this software module in hardware or software products are advised that
-/// their use may infringe existing patents. The original developers of
-/// this software module, JJ2000 Partners and ISO/IEC assume no liability
-/// for use of this software module or modifications thereof. No license
-/// or right to this software module is granted for non JPEG 2000 Standard
-/// conforming products. JJ2000 Partners have full right to use this
-/// software module for his/her own purpose, assign or donate this
-/// software module to any third party and to inhibit third parties from
-/// using this software module for non JPEG 2000 Standard conforming
-/// products. This copyright notice must be included in all copies or
-/// derivative works of this software module.
-///
-/// Copyright (c) 1999/2000 JJ2000 Partners.
-///
-///
-namespace CSJ2K.j2k.image.input
-{
-
- /// This is the generic interface to be implemented by all image file (or other
- /// resource) readers for different image file formats.
- ///
- /// An ImgReader behaves as an ImgData object. Whenever image data is
- /// requested through the getInternCompData() or getCompData() methods, the
- /// image data will be read (if it is not buffered) and returned. Implementing
- /// classes should not buffer large amounts of data, so as to reduce memory
- /// usage.
- ///
- /// This class sets the image origin to (0,0). All default implementations
- /// of the methods assume this.
- ///
- /// This class provides default implementations of many methods. These
- /// default implementations assume that there is no tiling (i.e., the only tile
- /// is the entire image), that the image origin is (0,0) in the canvas system
- /// and that there is no component subsampling (all components are the same
- /// size), but they can be overloaded by the implementating class if need
- /// be.
- ///
- ///
- public abstract class ImgReader : BlkImgDataSrc
- {
- /// Returns the width of the current tile in pixels, assuming there is
- /// no-tiling. Since no-tiling is assumed this is the same as the width of
- /// the image. The value of w is returned.
- ///
- ///
- /// The total image width in pixels.
- ///
- ///
- virtual public int TileWidth
- {
- get
- {
- return w;
- }
-
- }
- /// Returns the overall height of the current tile in pixels, assuming
- /// there is no-tiling. Since no-tiling is assumed this is the same as the
- /// width of the image. The value of h is returned.
- ///
- ///
- /// The total image height in pixels.
- ///
- virtual public int TileHeight
- {
- get
- {
- return h;
- }
-
- }
- /// Returns the nominal tiles width
- virtual public int NomTileWidth
- {
- get
- {
- return w;
- }
-
- }
- /// Returns the nominal tiles height
- virtual public int NomTileHeight
- {
- get
- {
- return h;
- }
-
- }
- /// Returns the overall width of the image in pixels. This is the image's
- /// width without accounting for any component subsampling or tiling. The
- /// value of w is returned.
- ///
- ///
- /// The total image's width in pixels.
- ///
- ///
- virtual public int ImgWidth
- {
- get
- {
- return w;
- }
-
- }
- /// Returns the overall height of the image in pixels. This is the image's
- /// height without accounting for any component subsampling or tiling. The
- /// value of h is returned.
- ///
- ///
- /// The total image's height in pixels.
- ///
- ///
- virtual public int ImgHeight
- {
- get
- {
- return h;
- }
-
- }
- /// Returns the number of components in the image. The value of nc
- /// is returned.
- ///
- ///
- /// The number of components in the image.
- ///
- ///
- virtual public int NumComps
- {
- get
- {
- return nc;
- }
-
- }
- /// Returns the index of the current tile, relative to a standard scan-line
- /// order. This default implementations assumes no tiling, so 0 is always
- /// returned.
- ///
- ///
- /// The current tile's index (starts at 0).
- ///
- ///
- virtual public int TileIdx
- {
- get
- {
- return 0;
- }
-
- }
- /// Returns the horizontal tile partition offset in the reference grid
- virtual public int TilePartULX
- {
- get
- {
- return 0;
- }
-
- }
- /// Returns the vertical tile partition offset in the reference grid
- virtual public int TilePartULY
- {
- get
- {
- return 0;
- }
-
- }
- /// Returns the horizontal coordinate of the image origin, the top-left
- /// corner, in the canvas system, on the reference grid.
- ///
- ///
- /// The horizontal coordinate of the image origin in the canvas
- /// system, on the reference grid.
- ///
- ///
- virtual public int ImgULX
- {
- get
- {
- return 0;
- }
-
- }
- /// Returns the vertical coordinate of the image origin, the top-left
- /// corner, in the canvas system, on the reference grid.
- ///
- ///
- /// The vertical coordinate of the image origin in the canvas
- /// system, on the reference grid.
- ///
- ///
- virtual public int ImgULY
- {
- get
- {
- return 0;
- }
-
- }
-
- /// The width of the image
- protected internal int w;
-
- /// The height of the image
- protected internal int h;
-
- /// The number of components in the image
- protected internal int nc;
-
- /// Closes the underlying file or network connection from where the
- /// image data is being read.
- ///
- ///
- /// If an I/O error occurs.
- ///
- public abstract void close();
-
- /// Returns the component subsampling factor in the horizontal direction,
- /// for the specified component. This is, approximately, the ratio of
- /// dimensions between the reference grid and the component itself, see the
- /// 'ImgData' interface desription for details.
- ///
- ///
- /// The index of the component (between 0 and C-1)
- ///
- ///
- /// The horizontal subsampling factor of component 'c'
- ///
- ///
- ///
- ///
- ///
- public virtual int getCompSubsX(int c)
- {
- return 1;
- }
-
- /// Returns the component subsampling factor in the vertical direction, for
- /// the specified component. This is, approximately, the ratio of
- /// dimensions between the reference grid and the component itself, see the
- /// 'ImgData' interface desription for details.
- ///
- ///
- /// The index of the component (between 0 and C-1)
- ///
- ///
- /// The vertical subsampling factor of component 'c'
- ///
- ///
- ///
- ///
- ///
- public virtual int getCompSubsY(int c)
- {
- return 1;
- }
-
- /// Returns the width in pixels of the specified tile-component. This
- /// default implementation assumes no tiling and no component subsampling
- /// (i.e., all components, or components, have the same dimensions in
- /// pixels).
- ///
- ///
- /// Tile index
- ///
- ///
- /// The index of the component, from 0 to C-1.
- ///
- ///
- /// The width in pixels of component c in tilet.
- ///
- ///
- public virtual int getTileCompWidth(int t, int c)
- {
- if (t != 0)
- {
- throw new System.ApplicationException("Asking a tile-component width for a tile index" + " greater than 0 whereas there is only one tile");
- }
- return w;
- }
-
- /// Returns the height in pixels of the specified tile-component. This
- /// default implementation assumes no tiling and no component subsampling
- /// (i.e., all components, or components, have the same dimensions in
- /// pixels).
- ///
- ///
- /// The tile index
- ///
- ///
- /// The index of the component, from 0 to C-1.
- ///
- ///
- /// The height in pixels of component c in tile
- /// t.
- ///
- ///
- public virtual int getTileCompHeight(int t, int c)
- {
- if (t != 0)
- {
- throw new System.ApplicationException("Asking a tile-component width for a tile index" + " greater than 0 whereas there is only one tile");
- }
- return h;
- }
-
- /// Returns the width in pixels of the specified component in the overall
- /// image. This default implementation assumes no component, or component,
- /// subsampling (i.e. all components have the same dimensions in pixels).
- ///
- ///
- /// The index of the component, from 0 to C-1.
- ///
- ///
- /// The width in pixels of component c in the overall
- /// image.
- ///
- ///
- public virtual int getCompImgWidth(int c)
- {
- return w;
- }
-
- /// Returns the height in pixels of the specified component in the overall
- /// image. This default implementation assumes no component, or component,
- /// subsampling (i.e. all components have the same dimensions in pixels).
- ///
- ///
- /// The index of the component, from 0 to C-1.
- ///
- ///
- /// The height in pixels of component c in the overall
- /// image.
- ///
- ///
- public virtual int getCompImgHeight(int c)
- {
- return h;
- }
-
- /// Changes the current tile, given the new coordinates. An
- /// IllegalArgumentException is thrown if the coordinates do not correspond
- /// to a valid tile. This default implementation assumes no tiling so the
- /// only valid arguments are x=0, y=0.
- ///
- ///
- /// The horizontal coordinate of the tile.
- ///
- ///
- /// The vertical coordinate of the new tile.
- ///
- ///
- public virtual void setTile(int x, int y)
- {
- if (x != 0 || y != 0)
- {
- throw new System.ArgumentException();
- }
- }
-
- /// Advances to the next tile, in standard scan-line order (by rows then
- /// columns). A NoNextElementException is thrown if the current tile is the
- /// last one (i.e. there is no next tile). This default implementation
- /// assumes no tiling, so NoNextElementException() is always thrown.
- ///
- ///
- public virtual void nextTile()
- {
- throw new NoNextElementException();
- }
-
- /// Returns the coordinates of the current tile. This default
- /// implementation assumes no-tiling, so (0,0) is returned.
- ///
- ///
- /// If not null this object is used to return the information. If
- /// null a new one is created and returned.
- ///
- ///
- /// The current tile's coordinates.
- ///
- ///
- public virtual Coord getTile(Coord co)
- {
- if (co != null)
- {
- co.x = 0;
- co.y = 0;
- return co;
- }
- else
- {
- return new Coord(0, 0);
- }
- }
-
- /// Returns the horizontal coordinate of the upper-left corner of the
- /// specified component in the current tile.
- ///
- ///
- /// The component index.
- ///
- ///
- public virtual int getCompULX(int c)
- {
- return 0;
- }
-
- /// Returns the vertical coordinate of the upper-left corner of the
- /// specified component in the current tile.
- ///
- ///
- /// The component index.
- ///
- ///
- public virtual int getCompULY(int c)
- {
- return 0;
- }
-
- /// Returns the number of tiles in the horizontal and vertical
- /// directions. This default implementation assumes no tiling, so (1,1) is
- /// always returned.
- ///
- ///
- /// If not null this object is used to return the information. If
- /// null a new one is created and returned.
- ///
- ///
- /// The number of tiles in the horizontal (Coord.x) and vertical
- /// (Coord.y) directions.
- ///
- ///
- public virtual Coord getNumTiles(Coord co)
- {
- if (co != null)
- {
- co.x = 1;
- co.y = 1;
- return co;
- }
- else
- {
- return new Coord(1, 1);
- }
- }
-
- /// Returns the total number of tiles in the image. This default
- /// implementation assumes no tiling, so 1 is always returned.
- ///
- ///
- /// The total number of tiles in the image.
- ///
- ///
- public virtual int getNumTiles()
- {
- return 1;
- }
-
- /// Returns true if the data read was originally signed in the specified
- /// component, false if not.
- ///
- ///
- /// The index of the component, from 0 to C-1.
- ///
- ///
- /// true if the data was originally signed, false if not.
- ///
- ///
- public abstract bool isOrigSigned(int c);
- public abstract int getFixedPoint(int param1);
- public abstract CSJ2K.j2k.image.DataBlk getInternCompData(CSJ2K.j2k.image.DataBlk param1, int param2);
- public abstract int getNomRangeBits(int param1);
- public abstract CSJ2K.j2k.image.DataBlk getCompData(CSJ2K.j2k.image.DataBlk param1, int param2);
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/image/input/ImgReaderGDI.cs b/CSJ2K/j2k/image/input/ImgReaderGDI.cs
deleted file mode 100644
index 124898af..00000000
--- a/CSJ2K/j2k/image/input/ImgReaderGDI.cs
+++ /dev/null
@@ -1,400 +0,0 @@
-/*
-*
-* Class: ImgWriterGDI
-*
-* Description: Image writer for System.Drawing.GDI streams
-*
-* */
-
-using System;
-using System.Drawing;
-using System.Drawing.Imaging;
-using System.IO;
-
-namespace CSJ2K.j2k.image.input
-{
- public class ImgReaderGDI : ImgReader
- {
- /// The number of bits that determine the nominal dynamic range
- private int rb;
-
- /// Buffer for the components of each pixel(in the current block)
- private int[][] barr;
-
- /// Data block used only to store coordinates of the buffered blocks
- private DataBlkInt dbi = new DataBlkInt();
-
- /// Temporary DataBlkInt object (needed when encoder uses floating-point
- /// filters). This avoid allocating new DataBlk at each time
- ///
- private DataBlkInt intBlk;
-
- private Image image;
-
- public ImgReaderGDI(Image image)
- {
- if (image.PixelFormat != PixelFormat.Format24bppRgb)
- throw new ArgumentException("Only 24bpp RGB images are currently supported");
-
- this.image = image;
-
- w = image.Width;
- h = image.Height;
-
- nc = 3;
- rb = 8;
- }
-
- /// Closes the underlying file from where the image data is being read. No
- /// operations are possible after a call to this method.
- ///
- ///
- /// If an I/O error occurs.
- ///
- ///
- public override void close()
- {
- image.Dispose();
- image = null;
-
- barr = null;
- }
-
- /// Returns the number of bits corresponding to the nominal range of the
- /// data in the specified component. This is the value rb (range bits) that
- /// was specified in the constructor, which normally is 8 for non bilevel
- /// data, and 1 for bilevel data.
- ///
- /// If this number is b then the nominal range is between
- /// -2^(b-1) and 2^(b-1)-1, since unsigned data is level shifted to have a
- /// nominal avergae of 0.
- ///
- ///
- /// The index of the component.
- ///
- ///
- /// The number of bits corresponding to the nominal range of the
- /// data. For floating-point data this value is not applicable and the
- /// return value is undefined.
- ///
- ///
- public override int getNomRangeBits(int c)
- {
- // Check component index
- if (c < 0 || c > 2)
- throw new System.ArgumentException();
-
- return rb;
- }
-
- /// Returns the position of the fixed point in the specified component
- /// (i.e. the number of fractional bits), which is always 0 for this
- /// ImgReader.
- ///
- ///
- /// The index of the component.
- ///
- ///
- /// The position of the fixed-point (i.e. the number of fractional
- /// bits). Always 0 for this ImgReader.
- ///
- ///
- public override int getFixedPoint(int c)
- {
- // Check component index
- if (c < 0 || c > 2)
- throw new System.ArgumentException();
- return 0;
- }
-
- /// Returns, in the blk argument, the block of image data containing the
- /// specifed rectangular area, in the specified component. The data is
- /// returned, as a reference to the internal data, if any, instead of as a
- /// copy, therefore the returned data should not be modified.
- ///
- /// After being read the coefficients are level shifted by subtracting
- /// 2^(nominal bit range - 1)
- ///
- ///
The rectangular area to return is specified by the 'ulx', 'uly', 'w'
- /// and 'h' members of the 'blk' argument, relative to the current
- /// tile. These members are not modified by this method. The 'offset' and
- /// 'scanw' of the returned data can be arbitrary. See the 'DataBlk' class.
- ///
- ///
If the data array in blk is null, then a new one
- /// is created if necessary. The implementation of this interface may
- /// choose to return the same array or a new one, depending on what is more
- /// efficient. Therefore, the data array in blk prior to the
- /// method call should not be considered to contain the returned data, a
- /// new array may have been created. Instead, get the array from
- /// blk after the method has returned.
- ///
- ///
The returned data always has its 'progressive' attribute unset
- /// (i.e. false).
- ///
- ///
When an I/O exception is encountered the JJ2KExceptionHandler is
- /// used. The exception is passed to its handleException method. The action
- /// that is taken depends on the action that has been registered in
- /// JJ2KExceptionHandler. See JJ2KExceptionHandler for details.
- ///
- ///
This method implements buffering for the 3 components: When the
- /// first one is asked, all the 3 components are read and stored until they
- /// are needed.
- ///
- ///
- /// Its coordinates and dimensions specify the area to
- /// return. Some fields in this object are modified to return the data.
- ///
- ///
- /// The index of the component from which to get the data. Only 0,
- /// 1 and 3 are valid.
- ///
- ///
- /// The requested DataBlk
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public override DataBlk getInternCompData(DataBlk blk, int c)
- {
- // Check component index
- if (c < 0 || c > 2)
- throw new System.ArgumentException();
-
- // Check type of block provided as an argument
- if (blk.DataType != DataBlk.TYPE_INT)
- {
- if (intBlk == null)
- intBlk = new DataBlkInt(blk.ulx, blk.uly, blk.w, blk.h);
- else
- {
- intBlk.ulx = blk.ulx;
- intBlk.uly = blk.uly;
- intBlk.w = blk.w;
- intBlk.h = blk.h;
- }
- blk = intBlk;
- }
-
- // If asking a component for the first time for this block, read all of the components
- if ((barr == null) || (dbi.ulx > blk.ulx) || (dbi.uly > blk.uly) || (dbi.ulx + dbi.w < blk.ulx + blk.w) || (dbi.uly + dbi.h < blk.uly + blk.h))
- {
- int i;
- int[] red, green, blue, alpha;
- int componentCount = (image.PixelFormat == PixelFormat.Format32bppArgb) ? 4 : 3;
-
- barr = new int[componentCount][];
-
- // Reset data arrays if needed
- if (barr[c] == null || barr[c].Length < blk.w * blk.h)
- {
- barr[c] = new int[blk.w * blk.h];
- }
- blk.Data = barr[c];
-
- i = (c + 1) % 3;
- if (barr[i] == null || barr[i].Length < blk.w * blk.h)
- {
- barr[i] = new int[blk.w * blk.h];
- }
- i = (c + 2) % 3;
- if (barr[i] == null || barr[i].Length < blk.w * blk.h)
- {
- barr[i] = new int[blk.w * blk.h];
- }
-
- if (componentCount == 4)
- {
- if (barr[3] == null || barr[3].Length < blk.w * blk.h)
- barr[3] = new int[blk.w * blk.h];
- }
-
- // set attributes of the DataBlk used for buffering
- dbi.ulx = blk.ulx;
- dbi.uly = blk.uly;
- dbi.w = blk.w;
- dbi.h = blk.h;
-
- red = barr[0];
- green = barr[1];
- blue = barr[2];
- alpha = (componentCount == 4) ? barr[3] : null;
-
- Bitmap bitmap = (Bitmap)image;
- BitmapData data = bitmap.LockBits(new Rectangle(blk.ulx, blk.uly, blk.w, blk.h), ImageLockMode.ReadOnly,
- (componentCount == 3) ? PixelFormat.Format24bppRgb : PixelFormat.Format32bppArgb);
- unsafe
- {
- byte* ptr = (byte*)data.Scan0.ToPointer();
-
- int k = 0;
- for (int j = 0; j < blk.w * blk.h; j++)
- {
- blue[k] = ((byte)*(ptr + 0) & 0xFF) - 128;
- green[k] = ((byte)*(ptr + 1) & 0xFF) - 128;
- red[k] = ((byte)*(ptr + 2) & 0xFF) - 128;
- if (componentCount == 4)
- alpha[k] = ((byte)*(ptr + 3) & 0xFF) - 128;
-
- ++k;
- ptr += 3;
- }
- }
- bitmap.UnlockBits(data);
-
- barr[0] = red;
- barr[1] = green;
- barr[2] = blue;
- if (componentCount == 4)
- barr[3] = alpha;
-
- // Set buffer attributes
- blk.Data = barr[c];
- blk.offset = 0;
- blk.scanw = blk.w;
- }
- else
- {
- //Asking for the 2nd or 3rd (or 4th) block component
- blk.Data = barr[c];
- blk.offset = (blk.ulx - dbi.ulx) * dbi.w + blk.ulx - dbi.ulx;
- blk.scanw = dbi.scanw;
- }
-
- // Turn off the progressive attribute
- blk.progressive = false;
- return blk;
- }
-
- /// Returns, in the blk argument, a block of image data containing the
- /// specifed rectangular area, in the specified component. The data is
- /// returned, as a copy of the internal data, therefore the returned data
- /// can be modified "in place".
- ///
- /// After being read the coefficients are level shifted by subtracting
- /// 2^(nominal bit range - 1)
- ///
- ///
The rectangular area to return is specified by the 'ulx', 'uly', 'w'
- /// and 'h' members of the 'blk' argument, relative to the current
- /// tile. These members are not modified by this method. The 'offset' of
- /// the returned data is 0, and the 'scanw' is the same as the block's
- /// width. See the 'DataBlk' class.
- ///
- ///
If the data array in 'blk' is 'null', then a new one is created. If
- /// the data array is not 'null' then it is reused, and it must be large
- /// enough to contain the block's data. Otherwise an 'ArrayStoreException'
- /// or an 'IndexOutOfBoundsException' is thrown by the Java system.
- ///
- ///
The returned data has its 'progressive' attribute unset
- /// (i.e. false).
- ///
- ///
When an I/O exception is encountered the JJ2KExceptionHandler is
- /// used. The exception is passed to its handleException method. The action
- /// that is taken depends on the action that has been registered in
- /// JJ2KExceptionHandler. See JJ2KExceptionHandler for details.
- ///
- ///
- /// Its coordinates and dimensions specify the area to
- /// return. If it contains a non-null data array, then it must have the
- /// correct dimensions. If it contains a null data array a new one is
- /// created. The fields in this object are modified to return the data.
- ///
- ///
- /// The index of the component from which to get the data. Only
- /// 0,1 and 2 are valid.
- ///
- ///
- /// The requested DataBlk
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public override DataBlk getCompData(DataBlk blk, int c)
- {
- // NOTE: can not directly call getInterCompData since that returns
- // internally buffered data.
- int ulx, uly, w, h;
-
- // Check type of block provided as an argument
- if (blk.DataType != DataBlk.TYPE_INT)
- {
- DataBlkInt tmp = new DataBlkInt(blk.ulx, blk.uly, blk.w, blk.h);
- blk = tmp;
- }
-
- int[] bakarr = (int[])blk.Data;
- // Save requested block size
- ulx = blk.ulx;
- uly = blk.uly;
- w = blk.w;
- h = blk.h;
- // Force internal data buffer to be different from external
- blk.Data = null;
- getInternCompData(blk, c);
- // Copy the data
- if (bakarr == null)
- {
- bakarr = new int[w * h];
- }
- if (blk.offset == 0 && blk.scanw == w)
- {
- // Requested and returned block buffer are the same size
- // CONVERSION PROBLEM?
- Array.Copy((System.Array)blk.Data, 0, (System.Array)bakarr, 0, w * h);
- }
- else
- {
- // Requested and returned block are different
- for (int i = h - 1; i >= 0; i--)
- {
- // copy line by line
- // CONVERSION PROBLEM?
- Array.Copy((System.Array)blk.Data, blk.offset + i * blk.scanw, (System.Array)bakarr, i * w, w);
- }
- }
- blk.Data = bakarr;
- blk.offset = 0;
- blk.scanw = blk.w;
- return blk;
- }
-
- /// Returns true if the data read was originally signed in the specified
- /// component, false if not. This method always returns false since PPM
- /// data is always unsigned.
- ///
- ///
- /// The index of the component, from 0 to N-1.
- ///
- ///
- /// always false, since PPM data is always unsigned.
- ///
- ///
- public override bool isOrigSigned(int c)
- {
- // Check component index
- if (c < 0 || c > 2)
- throw new System.ArgumentException();
- return false;
- }
-
- /// Returns a string of information about the object, more than 1 line
- /// long. The information string includes information from the underlying
- /// RandomAccessFile (its toString() method is called in turn).
- ///
- ///
- /// A string of information about the object.
- ///
- ///
- public override System.String ToString()
- {
- return "ImgReaderGDI: WxH = " + w + "x" + h + ", Component = 0,1,2";
- }
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/image/input/ImgReaderPGM.cs b/CSJ2K/j2k/image/input/ImgReaderPGM.cs
deleted file mode 100644
index a7fec8ac..00000000
--- a/CSJ2K/j2k/image/input/ImgReaderPGM.cs
+++ /dev/null
@@ -1,519 +0,0 @@
-/*
-*
-* Class: ImageWriterRawPGM
-*
-* Description: Image writer for unsigned 8 bit data in
-* PGM files.
-*
-*
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-* */
-namespace CSJ2K.j2k.image.input
-{
-
- /// This class implements the ImgData interface for reading 8 bit unsigned data
- /// from a binary PGM file.
- ///
- /// After being read the coefficients are level shifted by subtracting
- /// 2^(nominal bit range-1)
- ///
- /// The TransferType (see ImgData) of this class is TYPE_INT.
- ///
- /// NOTE: This class is not thread safe, for reasons of internal buffering.
- ///
- ///
- ///
- ///
- ///
- public class ImgReaderPGM : ImgReader
- {
-
- /// DC offset value used when reading image
- public static int DC_OFFSET = 128;
-
- /// Where to read the data from
- //UPGRADE_TODO: Class 'java.io.RandomAccessFile' was converted to 'System.IO.FileStream' which has a different behavior. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1073_javaioRandomAccessFile'"
- private System.IO.FileStream in_Renamed;
-
- /// The offset of the raw pixel data in the PGM file
- private int offset;
-
- /// The number of bits that determine the nominal dynamic range
- private int rb;
-
- /// The line buffer.
- // This makes the class not thrad safe
- // (but it is not the only one making it so)
- private byte[] buf;
-
- /// Temporary DataBlkInt object (needed when encoder uses floating-point
- /// filters). This avoid allocating new DataBlk at each time
- ///
- private DataBlkInt intBlk;
-
- /// Creates a new PGM file reader from the specified file.
- ///
- ///
- /// The input file.
- ///
- ///
- /// If an error occurs while opening the file.
- ///
- ///
- public ImgReaderPGM(System.IO.FileInfo file) : this(SupportClass.RandomAccessFileSupport.CreateRandomAccessFile(file, "r"))
- {
- }
-
- /// Creates a new PGM file reader from the specified file name.
- ///
- ///
- /// The input file name.
- ///
- ///
- /// If an error occurs while opening the file.
- ///
- ///
- public ImgReaderPGM(System.String fname) : this(SupportClass.RandomAccessFileSupport.CreateRandomAccessFile(fname, "r"))
- {
- }
-
- /// Creates a new PGM file reader from the specified RandomAccessFile
- /// object. The file header is read to acquire the image size.
- ///
- ///
- /// From where to read the data
- ///
- ///
- /// if an EOF is read
- ///
- /// if an error occurs when opening the file
- ///
- ///
- //UPGRADE_TODO: Class 'java.io.RandomAccessFile' was converted to 'System.IO.FileStream' which has a different behavior. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1073_javaioRandomAccessFile'"
- public ImgReaderPGM(System.IO.FileStream in_Renamed)
- {
- this.in_Renamed = in_Renamed;
-
- confirmFileType();
- skipCommentAndWhiteSpace();
- this.w = readHeaderInt();
- skipCommentAndWhiteSpace();
- this.h = readHeaderInt();
- skipCommentAndWhiteSpace();
- /*Read the highest pixel value from header (not used)*/
- readHeaderInt();
- this.nc = 1;
- this.rb = 8;
- }
-
-
- /// Closes the underlying RandomAccessFile from where the image data is
- /// being read. No operations are possible after a call to this method.
- ///
- ///
- /// If an I/O error occurs.
- ///
- ///
- public override void close()
- {
- in_Renamed.Close();
- in_Renamed = null;
- }
-
- /// Returns the number of bits corresponding to the nominal range of the
- /// data in the specified component. This is the value rb (range bits) that
- /// was specified in the constructor, which normally is 8 for non bilevel
- /// data, and 1 for bilevel data.
- ///
- /// If this number is b then the nominal range is between
- /// -2^(b-1) and 2^(b-1)-1, since unsigned data is level shifted to have a
- /// nominal average of 0.
- ///
- ///
- /// The index of the component.
- ///
- ///
- /// The number of bits corresponding to the nominal range of the
- /// data. Fro floating-point data this value is not applicable and the
- /// return value is undefined.
- ///
- ///
- public override int getNomRangeBits(int c)
- {
- // Check component index
- if (c != 0)
- throw new System.ArgumentException();
-
- return rb;
- }
-
-
- /// Returns the position of the fixed point in the specified component
- /// (i.e. the number of fractional bits), which is always 0 for this
- /// ImgReader.
- ///
- ///
- /// The index of the component.
- ///
- ///
- /// The position of the fixed-point (i.e. the number of fractional
- /// bits). Always 0 for this ImgReader.
- ///
- ///
- public override int getFixedPoint(int c)
- {
- // Check component index
- if (c != 0)
- throw new System.ArgumentException();
- return 0;
- }
-
-
- /// Returns, in the blk argument, the block of image data containing the
- /// specifed rectangular area, in the specified component. The data is
- /// returned, as a reference to the internal data, if any, instead of as a
- /// copy, therefore the returned data should not be modified.
- ///
- /// After being read the coefficients are level shifted by subtracting
- /// 2^(nominal bit range - 1)
- ///
- ///
The rectangular area to return is specified by the 'ulx', 'uly', 'w'
- /// and 'h' members of the 'blk' argument, relative to the current
- /// tile. These members are not modified by this method. The 'offset' and
- /// 'scanw' of the returned data can be arbitrary. See the 'DataBlk' class.
- ///
- ///
If the data array in blk is null, then a new one
- /// is created if necessary. The implementation of this interface may
- /// choose to return the same array or a new one, depending on what is more
- /// efficient. Therefore, the data array in blk prior to the
- /// method call should not be considered to contain the returned data, a
- /// new array may have been created. Instead, get the array from
- /// blk after the method has returned.
- ///
- ///
The returned data always has its 'progressive' attribute unset
- /// (i.e. false).
- ///
- ///
When an I/O exception is encountered the JJ2KExceptionHandler is
- /// used. The exception is passed to its handleException method. The action
- /// that is taken depends on the action that has been registered in
- /// JJ2KExceptionHandler. See JJ2KExceptionHandler for details.
- ///
- ///
- /// Its coordinates and dimensions specify the area to
- /// return. Some fields in this object are modified to return the data.
- ///
- ///
- /// The index of the component from which to get the data. Only 0
- /// is valid.
- ///
- ///
- /// The requested DataBlk
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public override DataBlk getInternCompData(DataBlk blk, int c)
- {
- int k, j, i, mi;
- int[] barr;
-
- // Check component index
- if (c != 0)
- throw new System.ArgumentException();
-
- // Check type of block provided as an argument
- if (blk.DataType != DataBlk.TYPE_INT)
- {
- if (intBlk == null)
- intBlk = new DataBlkInt(blk.ulx, blk.uly, blk.w, blk.h);
- else
- {
- intBlk.ulx = blk.ulx;
- intBlk.uly = blk.uly;
- intBlk.w = blk.w;
- intBlk.h = blk.h;
- }
- blk = intBlk;
- }
-
- // Get data array
- barr = (int[])blk.Data;
- if (barr == null || barr.Length < blk.w * blk.h)
- {
- barr = new int[blk.w * blk.h];
- blk.Data = barr;
- }
-
- // Check line buffer
- if (buf == null || buf.Length < blk.w)
- {
- buf = new byte[blk.w];
- }
-
- try
- {
- // Read line by line
- mi = blk.uly + blk.h;
- for (i = blk.uly; i < mi; i++)
- {
- // Reposition in input
- in_Renamed.Seek(offset + i * w + blk.ulx, System.IO.SeekOrigin.Begin);
- in_Renamed.Read(buf, 0, blk.w);
- for (k = (i - blk.uly) * blk.w + blk.w - 1, j = blk.w - 1; j >= 0; j--, k--)
- {
- barr[k] = (((int)buf[j]) & 0xFF) - DC_OFFSET;
- }
- }
- }
- catch (System.IO.IOException e)
- {
- JJ2KExceptionHandler.handleException(e);
- }
-
- // Turn off the progressive attribute
- blk.progressive = false;
- // Set buffer attributes
- blk.offset = 0;
- blk.scanw = blk.w;
- return blk;
- }
-
- /// Returns, in the blk argument, a block of image data containing the
- /// specifed rectangular area, in the specified component. The data is
- /// returned, as a copy of the internal data, therefore the returned data
- /// can be modified "in place".
- ///
- /// After being read the coefficients are level shifted by subtracting
- /// 2^(nominal bit range - 1)
- ///
- ///
The rectangular area to return is specified by the 'ulx', 'uly', 'w'
- /// and 'h' members of the 'blk' argument, relative to the current
- /// tile. These members are not modified by this method. The 'offset' of
- /// the returned data is 0, and the 'scanw' is the same as the block's
- /// width. See the 'DataBlk' class.
- ///
- ///
If the data array in 'blk' is 'null', then a new one is created. If
- /// the data array is not 'null' then it is reused, and it must be large
- /// enough to contain the block's data. Otherwise an 'ArrayStoreException'
- /// or an 'IndexOutOfBoundsException' is thrown by the Java system.
- ///
- ///
The returned data has its 'progressive' attribute unset
- /// (i.e. false).
- ///
- ///
This method just calls 'getInternCompData(blk, n)'.
- ///
- ///
When an I/O exception is encountered the JJ2KExceptionHandler is
- /// used. The exception is passed to its handleException method. The action
- /// that is taken depends on the action that has been registered in
- /// JJ2KExceptionHandler. See JJ2KExceptionHandler for details.
- ///
- ///
- /// Its coordinates and dimensions specify the area to
- /// return. If it contains a non-null data array, then it must have the
- /// correct dimensions. If it contains a null data array a new one is
- /// created. The fields in this object are modified to return the data.
- ///
- ///
- /// The index of the component from which to get the data. Only 0
- /// is valid.
- ///
- ///
- /// The requested DataBlk
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public override DataBlk getCompData(DataBlk blk, int c)
- {
- return getInternCompData(blk, c);
- }
-
- /// Returns a byte read from the RandomAccessIO. The number of read byted
- /// are counted to keep track of the offset of the pixel data in the PGM
- /// file
- ///
- ///
- /// One byte read from the header of the PGM file.
- ///
- ///
- /// If an I/O error occurs.
- ///
- ///
- /// If an EOF is read
- ///
- ///
- private byte countedByteRead()
- {
- offset++;
- return (byte)in_Renamed.ReadByte();
- }
-
- /// Checks that the RandomAccessIO begins with 'P5'
- ///
- ///
- /// If an I/O error occurs.
- ///
- /// If an EOF is read
- ///
- ///
- private void confirmFileType()
- {
- byte[] type = new byte[] { 80, 53 }; // 'P5'
- int i;
- byte b;
-
- for (i = 0; i < 2; i++)
- {
- b = countedByteRead();
- if (b != type[i])
- {
- if (i == 1 && b == 50)
- {
- //i.e 'P2'
- throw new System.ArgumentException("JJ2000 does not support" + " ascii-PGM files. Use " + " raw-PGM file instead. ");
- }
- else
- {
- throw new System.ArgumentException("Not a raw-PGM file");
- }
- }
- }
- }
-
- /// Skips any line in the header starting with '#' and any space, tab, line
- /// feed or carriage return.
- ///
- ///
- /// If an I/O error occurs.
- ///
- /// if an EOF is read
- ///
- ///
- private void skipCommentAndWhiteSpace()
- {
-
- bool done = false;
- byte b;
-
- while (!done)
- {
- b = countedByteRead();
- if (b == 35)
- {
- // Comment start
- while (b != 10 && b != 13)
- {
- // Comment ends in end of line
- b = countedByteRead();
- }
- }
- else if (!(b == 9 || b == 10 || b == 13 || b == 32))
- {
- // If not whitespace
- done = true;
- }
- }
- // Put last valid byte in
- offset--;
- in_Renamed.Seek(offset, System.IO.SeekOrigin.Begin);
- }
-
-
- /// Returns an int read from the header of the PGM file.
- ///
- ///
- /// One int read from the header of the PGM file.
- ///
- ///
- /// If an I/O error occurs.
- ///
- /// If an EOF is read
- ///
- ///
- private int readHeaderInt()
- {
- int res = 0;
- byte b = 0;
-
- b = countedByteRead();
- while (b != 32 && b != 10 && b != 9 && b != 13)
- {
- // While not whitespace
- res = res * 10 + b - 48; // Covert ASCII to numerical value
- b = countedByteRead();
- }
- return res;
- }
-
- /// Returns true if the data read was originally signed in the specified
- /// component, false if not. This method returns always false since PGM
- /// data is always unsigned.
- ///
- ///
- /// The index of the component, from 0 to N-1.
- ///
- ///
- /// always false, since PGM data is always unsigned.
- ///
- ///
- public override bool isOrigSigned(int c)
- {
- // Check component index
- if (c != 0)
- throw new System.ArgumentException();
- return false;
- }
-
- /// Returns a string of information about the object, more than 1 line
- /// long. The information string includes information from the underlying
- /// RandomAccessIO (its toString() method is called in turn).
- ///
- ///
- /// A string of information about the object.
- ///
- ///
- public override System.String ToString()
- {
- //UPGRADE_TODO: The equivalent in .NET for method 'java.lang.Object.toString' may return a different value. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1043'"
- return "ImgReaderPGM: WxH = " + w + "x" + h + ", Component = 0" + "\nUnderlying RandomAccessIO:\n" + in_Renamed.ToString();
- }
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/image/input/ImgReaderPGX.cs b/CSJ2K/j2k/image/input/ImgReaderPGX.cs
deleted file mode 100644
index 0b209366..00000000
--- a/CSJ2K/j2k/image/input/ImgReaderPGX.cs
+++ /dev/null
@@ -1,667 +0,0 @@
-/*
-* CVS identifier:
-*
-* $Id: ImgReaderPGX.java,v 1.13 2002/07/25 15:08:13 grosbois Exp $
-*
-* Class: ImgReaderPGX
-*
-* Description: Image Reader for PGX files (custom file format
-* for VM3A)
-*
-*
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-* */
-using CSJ2K.j2k.io;
-namespace CSJ2K.j2k.image.input
-{
-
- /// This class extends the ImgReader abstract class for reading PGX files. PGX
- /// is a custom monochrome file format invented specifically to simplify the
- /// use of JPEG 2000 with images of different bit-depths in the range 1 to 31
- /// bits per pixel.
- ///
- /// The file consists of a one line text header followed by the data.
- ///
- ///
- /// Header: "PG"+ ws +<endianess>+ ws
- /// +[sign]+ws + <bit-depth>+"
- /// "+<width>+" "+<height>+'\n'
- ///
- /// where:
- ///
- /// - ws (white-spaces) is any combination of characters ' ' and
- /// '\t'.
- /// - endianess equals "LM" or "ML"(resp. little-endian or
- /// big-endian)
- /// - sign equals "+" or "-" (resp. unsigned or signed). If omited,
- /// values are supposed to be unsigned.
- /// - bit-depth that can be any number between 1 and 31.
- /// - width and height are the image dimensions (in
- /// pixels).
- ///
- ///
- /// Data: The image binary values appear one after the other (in raster
- /// order) immediately after the last header character ('\n') and are
- /// byte-aligned (they are packed into 1,2 or 4 bytes per sample, depending
- /// upon the bit-depth value).
- ///
- ///
- /// If the data is unisigned, level shifting is applied subtracting
- /// 2^(bitdepth - 1)
- ///
- /// Since it is not possible to know the input file byte-ordering before
- /// reading its header, this class can not be construct from a
- /// RandomAccessIO. So, the constructor has to open first the input file, to
- /// read only its header, and then it can create the appropriate
- /// BufferedRandomAccessFile (Big-Endian or Little-Endian byte-ordering).
- ///
- /// NOTE: This class is not thread safe, for reasons of internal
- /// buffering.
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public class ImgReaderPGX : ImgReader, EndianType
- {
-
- /// The offset of the raw pixel data in the PGX file
- private int offset;
-
- /// The RandomAccessIO where to get datas from
- //UPGRADE_TODO: Class 'java.io.RandomAccessFile' was converted to 'System.IO.FileStream' which has a different behavior. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1073_javaioRandomAccessFile'"
- private System.IO.FileStream in_Renamed;
-
- /// The bit-depth of the input file (must be between 1 and 31)
- private int bitDepth;
-
- /// Whether the input datas are signed or not
- private bool isSigned;
-
-
- /// The pack length of one sample (in bytes, according to the output
- /// bit-depth
- ///
- private int packBytes;
-
- /// The byte ordering to use, as defined in EndianType
- private int byteOrder;
-
- /// The line buffer.
- // This makes the class not thrad safe
- // (but it is not the only one making it so)
- private byte[] buf;
-
- /// Temporary DataBlkInt object (needed when encoder uses floating-point
- /// filters). This avoid allocating new DataBlk at each time
- ///
- private DataBlkInt intBlk;
-
- /// Creates a new PGX file reader from the specified File object.
- ///
- ///
- /// The input file as File object.
- ///
- ///
- /// If an I/O error occurs.
- ///
- ///
- public ImgReaderPGX(System.IO.FileInfo in_Renamed)
- {
- System.String header;
-
- // Check if specified file exists
- bool tmpBool;
- if (System.IO.File.Exists(in_Renamed.FullName))
- tmpBool = true;
- else
- tmpBool = System.IO.Directory.Exists(in_Renamed.FullName);
- if (!tmpBool)
- {
- throw new System.ArgumentException("PGX file " + in_Renamed.Name + " does not exist");
- }
-
- //Opens the given file
- this.in_Renamed = SupportClass.RandomAccessFileSupport.CreateRandomAccessFile(in_Renamed, "r");
- try
- {
- System.IO.StreamReader in_reader = new System.IO.StreamReader(this.in_Renamed);
- //UPGRADE_ISSUE: Method 'java.io.RandomAccessFile.readLine' was not converted. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1000_javaioRandomAccessFilereadLine'"
- header = in_reader.ReadLine();
- }
- catch (System.IO.IOException)
- {
- throw new System.IO.IOException(in_Renamed.Name + " is not a PGX file");
- }
- if (header == null)
- {
- throw new System.IO.IOException(in_Renamed.Name + " is an empty file");
- }
- offset = (header.Length + 1);
-
- //Get informations from header
- SupportClass.Tokenizer st = new SupportClass.Tokenizer(header);
- try
- {
- int nTokens = st.Count;
-
- // Magic Number
- if (!(st.NextToken()).Equals("PG"))
- throw new System.IO.IOException(in_Renamed.Name + " is not a PGX file");
-
- // Endianess
- System.String tmp = st.NextToken();
- if (tmp.Equals("LM"))
- byteOrder = CSJ2K.j2k.io.EndianType_Fields.LITTLE_ENDIAN;
- else if (tmp.Equals("ML"))
- byteOrder = CSJ2K.j2k.io.EndianType_Fields.BIG_ENDIAN;
- else
- throw new System.IO.IOException(in_Renamed.Name + " is not a PGX file");
-
- // Unsigned/signed if present in the header
- if (nTokens == 6)
- {
- tmp = st.NextToken();
- if (tmp.Equals("+"))
- isSigned = false;
- else if (tmp.Equals("-"))
- isSigned = true;
- else
- throw new System.IO.IOException(in_Renamed.Name + " is not a PGX file");
- }
-
- // bit-depth, width, height
- try
- {
- bitDepth = (System.Int32.Parse(st.NextToken()));
- // bitDepth must be between 1 and 31
- if ((bitDepth <= 0) || (bitDepth > 31))
- throw new System.IO.IOException(in_Renamed.Name + " is not a valid PGX file");
-
- w = (System.Int32.Parse(st.NextToken()));
- h = (System.Int32.Parse(st.NextToken()));
- }
- catch (System.FormatException)
- {
- throw new System.IO.IOException(in_Renamed.Name + " is not a PGX file");
- }
- }
- catch (System.ArgumentOutOfRangeException)
- {
- throw new System.IO.IOException(in_Renamed.Name + " is not a PGX file");
- }
-
- // Number of component
- nc = 1;
-
- // Number of bytes per data
- if (bitDepth <= 8)
- packBytes = 1;
- else if (bitDepth <= 16)
- packBytes = 2;
- // <= 31
- else
- packBytes = 4;
- }
-
- /// Creates a new PGX file reader from the specified file name.
- ///
- ///
- /// The input file name.
- ///
- ///
- public ImgReaderPGX(System.String inName) : this(new System.IO.FileInfo(inName))
- {
- }
-
- /// Closes the underlying RandomAccessIO from where the image data is being
- /// read. No operations are possible after a call to this method.
- ///
- ///
- /// If an I/O error occurs.
- ///
- ///
- public override void close()
- {
- in_Renamed.Close();
- in_Renamed = null;
- buf = null;
- }
-
- /// Returns the number of bits corresponding to the nominal range of the
- /// data in the specified component. This is the value of bitDepth which is
- /// read in the PGX file header.
- ///
- /// If this number is b then the nominal range is between
- /// -2^(b-1) and 2^(b-1)-1, for originally signed or unsigned data
- /// (unsigned data is level shifted to have a nominal average of 0).
- ///
- ///
- /// The index of the component.
- ///
- ///
- /// The number of bits corresponding to the nominal range of the
- /// data.
- ///
- ///
- public override int getNomRangeBits(int c)
- {
- // Check component index
- if (c != 0)
- throw new System.ArgumentException();
-
- return bitDepth;
- }
-
- /// Returns the position of the fixed point in the specified component
- /// (i.e. the number of fractional bits), which is always 0 for this
- /// ImgReader.
- ///
- ///
- /// The index of the component.
- ///
- ///
- /// The position of the fixed-point (i.e. the number of fractional
- /// bits). Always 0 for this ImgReader.
- ///
- ///
- public override int getFixedPoint(int c)
- {
- // Check component index
- if (c != 0)
- throw new System.ArgumentException();
- return 0;
- }
-
- /// Returns, in the blk argument, the block of image data containing the
- /// specifed rectangular area, in the specified component. The data is
- /// returned, as a reference to the internal data, if any, instead of as a
- /// copy, therefore the returned data should not be modified.
- ///
- /// After being read the coefficients are level shifted by subtracting
- /// 2^(nominal bit range - 1)
- ///
- ///
The rectangular area to return is specified by the 'ulx', 'uly', 'w'
- /// and 'h' members of the 'blk' argument, relative to the current
- /// tile. These members are not modified by this method. The 'offset' and
- /// 'scanw' of the returned data can be arbitrary. See the 'DataBlk'
- /// class.
- ///
- /// If the data array in blk is null, then a new one
- /// is created if necessary. The implementation of this interface may
- /// choose to return the same array or a new one, depending on what is more
- /// efficient. Therefore, the data array in blk prior to the
- /// method call should not be considered to contain the returned data, a
- /// new array may have been created. Instead, get the array from
- /// blk after the method has returned.
- ///
- /// The returned data always has its 'progressive' attribute unset
- /// (i.e. false).
- ///
- /// When an I/O exception is encountered the JJ2KExceptionHandler is
- /// used. The exception is passed to its handleException method. The action
- /// that is taken depends on the action that has been registered in
- /// JJ2KExceptionHandler. See JJ2KExceptionHandler for details.
- ///
- ///
- /// Its coordinates and dimensions specify the area to
- /// return. Some fields in this object are modified to return the data.
- ///
- ///
- /// The index of the component from which to get the data. Only 0
- /// is valid.
- ///
- ///
- /// The requested DataBlk
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public override DataBlk getInternCompData(DataBlk blk, int c)
- {
- int k, j, i, mi; // counters
- int levShift = 1 << (bitDepth - 1);
-
- // Check component index
- if (c != 0)
- throw new System.ArgumentException();
-
- // Check type of block provided as an argument
- if (blk.DataType != DataBlk.TYPE_INT)
- {
- if (intBlk == null)
- intBlk = new DataBlkInt(blk.ulx, blk.uly, blk.w, blk.h);
- else
- {
- intBlk.ulx = blk.ulx;
- intBlk.uly = blk.uly;
- intBlk.w = blk.w;
- intBlk.h = blk.h;
- }
- blk = intBlk;
- }
-
- // Get data array
- int[] barr = (int[])blk.Data;
- if (barr == null || barr.Length < blk.w * blk.h * packBytes)
- {
- barr = new int[blk.w * blk.h];
- blk.Data = barr;
- }
-
- int paddingLength = (32 - bitDepth);
- if (buf == null || buf.Length < packBytes * blk.w)
- {
- buf = new byte[packBytes * blk.w];
- }
- try
- {
- switch (packBytes)
- {
-
- // Switch between one of the 3 byte packet type
- case 1: // Samples packed into 1 byte
- // Read line by line
- mi = blk.uly + blk.h;
- if (isSigned)
- {
- for (i = blk.uly; i < mi; i++)
- {
- // Reposition in input
- in_Renamed.Seek(offset + i * w + blk.ulx, System.IO.SeekOrigin.Begin);
- in_Renamed.Read(buf, 0, blk.w);
- for (k = (i - blk.uly) * blk.w + blk.w - 1, j = blk.w - 1; j >= 0; k--)
- barr[k] = (((buf[j--] & 0xFF) << paddingLength) >> paddingLength);
- }
- }
- else
- {
- // Not signed
- for (i = blk.uly; i < mi; i++)
- {
- // Reposition in input
- in_Renamed.Seek(offset + i * w + blk.ulx, System.IO.SeekOrigin.Begin);
- in_Renamed.Read(buf, 0, blk.w);
- for (k = (i - blk.uly) * blk.w + blk.w - 1, j = blk.w - 1; j >= 0; k--)
- barr[k] = (SupportClass.URShift(((buf[j--] & 0xFF) << paddingLength), paddingLength)) - levShift;
- }
- }
- break;
-
-
- case 2: // Samples packed into 2 bytes
- // Read line by line
- mi = blk.uly + blk.h;
- if (isSigned)
- {
- for (i = blk.uly; i < mi; i++)
- {
- // Reposition in input
- in_Renamed.Seek(offset + 2 * (i * w + blk.ulx), System.IO.SeekOrigin.Begin);
- in_Renamed.Read(buf, 0, blk.w << 1);
- switch (byteOrder)
- {
-
- case CSJ2K.j2k.io.EndianType_Fields.LITTLE_ENDIAN:
- for (k = (i - blk.uly) * blk.w + blk.w - 1, j = (blk.w << 1) - 1; j >= 0; k--)
- {
- barr[k] = ((((buf[j--] & 0xFF) << 8) | (buf[j--] & 0xFF)) << paddingLength) >> paddingLength;
- }
- break;
-
- case CSJ2K.j2k.io.EndianType_Fields.BIG_ENDIAN:
- for (k = (i - blk.uly) * blk.w + blk.w - 1, j = (blk.w << 1) - 1; j >= 0; k--)
- {
- barr[k] = (((buf[j--] & 0xFF) | ((buf[j--] & 0xFF) << 8)) << paddingLength) >> paddingLength;
- }
- break;
-
- default:
- throw new System.ApplicationException("Internal JJ2000 bug");
-
- }
- }
- }
- else
- {
- // If not signed
- for (i = blk.uly; i < mi; i++)
- {
- // Reposition in input
- in_Renamed.Seek(offset + 2 * (i * w + blk.ulx), System.IO.SeekOrigin.Begin);
- in_Renamed.Read(buf, 0, blk.w << 1);
- switch (byteOrder)
- {
-
- case CSJ2K.j2k.io.EndianType_Fields.LITTLE_ENDIAN:
- for (k = (i - blk.uly) * blk.w + blk.w - 1, j = (blk.w << 1) - 1; j >= 0; k--)
- {
- barr[k] = (SupportClass.URShift(((((buf[j--] & 0xFF) << 8) | (buf[j--] & 0xFF)) << paddingLength), paddingLength)) - levShift;
- }
- break;
-
- case CSJ2K.j2k.io.EndianType_Fields.BIG_ENDIAN:
- for (k = (i - blk.uly) * blk.w + blk.w - 1, j = (blk.w << 1) - 1; j >= 0; k--)
- {
- barr[k] = (SupportClass.URShift((((buf[j--] & 0xFF) | ((buf[j--] & 0xFF) << 8)) << paddingLength), paddingLength)) - levShift;
- }
- break;
-
- default:
- throw new System.ApplicationException("Internal JJ2000 bug");
-
- }
- }
- }
- break;
-
-
- case 4: // Samples packed into 4 bytes
- // Read line by line
- mi = blk.uly + blk.h;
- if (isSigned)
- {
- for (i = blk.uly; i < mi; i++)
- {
- // Reposition in input
- in_Renamed.Seek(offset + 4 * (i * w + blk.ulx), System.IO.SeekOrigin.Begin);
- in_Renamed.Read(buf, 0, blk.w << 2);
- switch (byteOrder)
- {
-
- case CSJ2K.j2k.io.EndianType_Fields.LITTLE_ENDIAN:
- for (k = (i - blk.uly) * blk.w + blk.w - 1, j = (blk.w << 2) - 1; j >= 0; k--)
- {
- barr[k] = ((((buf[j--] & 0xFF) << 24) | ((buf[j--] & 0xFF) << 16) | ((buf[j--] & 0xFF) << 8) | (buf[j--] & 0xFF)) << paddingLength) >> paddingLength;
- }
- break;
-
- case CSJ2K.j2k.io.EndianType_Fields.BIG_ENDIAN:
- for (k = (i - blk.uly) * blk.w + blk.w - 1, j = (blk.w << 2) - 1; j >= 0; k--)
- {
- barr[k] = (((buf[j--] & 0xFF) | ((buf[j--] & 0xFF) << 8) | ((buf[j--] & 0xFF) << 16) | ((buf[j--] & 0xFF) << 24)) << paddingLength) >> paddingLength;
- }
- break;
-
- default:
- throw new System.ApplicationException("Internal JJ2000 bug");
-
- }
- }
- }
- else
- {
- for (i = blk.uly; i < mi; i++)
- {
- // Reposition in input
- in_Renamed.Seek(offset + 4 * (i * w + blk.ulx), System.IO.SeekOrigin.Begin);
- in_Renamed.Read(buf, 0, blk.w << 2);
- switch (byteOrder)
- {
-
- case CSJ2K.j2k.io.EndianType_Fields.LITTLE_ENDIAN:
- for (k = (i - blk.uly) * blk.w + blk.w - 1, j = (blk.w << 2) - 1; j >= 0; k--)
- {
- barr[k] = (SupportClass.URShift(((((buf[j--] & 0xFF) << 24) | ((buf[j--] & 0xFF) << 16) | ((buf[j--] & 0xFF) << 8) | (buf[j--] & 0xFF)) << paddingLength), paddingLength)) - levShift;
- }
- break;
-
- case CSJ2K.j2k.io.EndianType_Fields.BIG_ENDIAN:
- for (k = (i - blk.uly) * blk.w + blk.w - 1, j = (blk.w << 2) - 1; j >= 0; k--)
- {
- barr[k] = (SupportClass.URShift((((buf[j--] & 0xFF) | ((buf[j--] & 0xFF) << 8) | ((buf[j--] & 0xFF) << 16) | ((buf[j--] & 0xFF) << 24)) << paddingLength), paddingLength)) - levShift;
- }
- break;
-
- default:
- throw new System.ApplicationException("Internal JJ2000 bug");
-
- }
- }
- }
- break;
-
-
- default:
- throw new System.IO.IOException("PGX supports only bit-depth between" + " 1 and 31");
-
- }
- }
- catch (System.IO.IOException e)
- {
- JJ2KExceptionHandler.handleException(e);
- }
-
- // Turn off the progressive attribute
- blk.progressive = false;
- // Set buffer attributes
- blk.offset = 0;
- blk.scanw = blk.w;
- return blk;
- }
-
- /// Returns, in the blk argument, a block of image data containing the
- /// specifed rectangular area, in the specified component. The data is
- /// returned, as a copy of the internal data, therefore the returned data
- /// can be modified "in place".
- ///
- /// After being read the coefficients are level shifted by subtracting
- /// 2^(nominal bit range - 1)
- ///
- ///
The rectangular area to return is specified by the 'ulx', 'uly', 'w'
- /// and 'h' members of the 'blk' argument, relative to the current
- /// tile. These members are not modified by this method. The 'offset' of
- /// the returned data is 0, and the 'scanw' is the same as the block's
- /// width. See the 'DataBlk' class.
- ///
- /// If the data array in 'blk' is 'null', then a new one is created. If
- /// the data array is not 'null' then it is reused, and it must be large
- /// enough to contain the block's data. Otherwise an 'ArrayStoreException'
- /// or an 'IndexOutOfBoundsException' is thrown by the Java system.
- ///
- /// The returned data has its 'progressive' attribute unset
- /// (i.e. false).
- ///
- /// This method just calls 'getInternCompData(blk,c)'.
- ///
- /// When an I/O exception is encountered the JJ2KExceptionHandler is
- /// used. The exception is passed to its handleException method. The action
- /// that is taken depends on the action that has been registered in
- /// JJ2KExceptionHandler. See JJ2KExceptionHandler for details.
- ///
- ///
- /// Its coordinates and dimensions specify the area to
- /// return. If it contains a non-null data array, then it must have the
- /// correct dimensions. If it contains a null data array a new one is
- /// created. The fields in this object are modified to return the data.
- ///
- ///
- /// The index of the component from which to get the data. Only 0
- /// is valid.
- ///
- ///
- /// The requested DataBlk
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public override DataBlk getCompData(DataBlk blk, int c)
- {
- return getInternCompData(blk, c);
- }
-
- /// Returns true if the data read was originally signed in the specified
- /// component, false if not.
- ///
- ///
- /// The index of the component, from 0 to N-1.
- ///
- ///
- /// true if the data was originally signed, false if not.
- ///
- ///
- public override bool isOrigSigned(int c)
- {
- // Check component index
- if (c != 0)
- throw new System.ArgumentException();
- return isSigned;
- }
-
- /// Returns a string of information about the object, more than 1 line
- /// long. The information string includes information from the underlying
- /// RandomAccessIO (its toString() method is called in turn).
- ///
- ///
- /// A string of information about the object.
- ///
- ///
- public override System.String ToString()
- {
- //UPGRADE_TODO: The equivalent in .NET for method 'java.lang.Object.toString' may return a different value. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1043'"
- return "ImgReaderPGX: WxH = " + w + "x" + h + ", Component = 0" + ", Bit-depth = " + bitDepth + ", signed = " + isSigned + "\nUnderlying RandomAccessIO:\n" + in_Renamed.ToString();
- }
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/image/input/ImgReaderPPM.cs b/CSJ2K/j2k/image/input/ImgReaderPPM.cs
deleted file mode 100644
index e3487b9e..00000000
--- a/CSJ2K/j2k/image/input/ImgReaderPPM.cs
+++ /dev/null
@@ -1,600 +0,0 @@
-/*
-*
-* Class: ImgWriterPPM
-*
-* Description: Image writer for unsigned 8 bit data in
-* PPM files.
-*
-*
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-* */
-using System;
-namespace CSJ2K.j2k.image.input
-{
-
- /// This class implements the ImgData interface for reading 8 bits unsigned
- /// data from a binary PPM file
- ///
- /// After being read the coefficients are level shifted by subtracting
- /// 2^(nominal bit range - 1)
- ///
- ///
The transfer type (see ImgData) of this class is TYPE_INT.
- ///
- ///
This class is buffered: the 3 input components(R,G,B) are read
- /// when the first one (R) is asked. The 2 others are stored until they are
- /// needed.
- ///
- ///
NOTE: This class is not thread safe, for reasons of internal buffering.
- ///
- ///
- ///
- ///
- ///
- public class ImgReaderPPM : ImgReader
- {
-
- /// DC offset value used when reading image
- public static int DC_OFFSET = 128;
-
- /// Where to read the data from
- //UPGRADE_TODO: Class 'java.io.RandomAccessFile' was converted to 'System.IO.FileStream' which has a different behavior. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1073_javaioRandomAccessFile'"
- private System.IO.FileStream in_Renamed;
-
- /// The offset of the raw pixel data in the PPM file
- private int offset;
-
- /// The number of bits that determine the nominal dynamic range
- private int rb;
-
- /// Buffer for the 3 components of each pixel(in the current block)
- private int[][] barr = new int[3][];
-
- /// Data block used only to store coordinates of the buffered blocks
- private DataBlkInt dbi = new DataBlkInt();
-
- /// The line buffer.
- // This makes the class not thread safe (but it is not the only one making
- // it so)
- private byte[] buf;
-
- /// Temporary DataBlkInt object (needed when encoder uses floating-point
- /// filters). This avoid allocating new DataBlk at each time
- ///
- private DataBlkInt intBlk;
-
- /// Creates a new PPM file reader from the specified file.
- ///
- ///
- /// The input file.
- ///
- ///
- /// If an error occurs while opening the file.
- ///
- ///
- public ImgReaderPPM(System.IO.FileInfo file) : this(SupportClass.RandomAccessFileSupport.CreateRandomAccessFile(file, "r"))
- {
- }
-
- /// Creates a new PPM file reader from the specified file name.
- ///
- ///
- /// The input file name.
- ///
- ///
- /// If an error occurs while opening the file.
- ///
- ///
- public ImgReaderPPM(System.String fname) : this(SupportClass.RandomAccessFileSupport.CreateRandomAccessFile(fname, "r"))
- {
- }
-
- /// Creates a new PPM file reader from the specified RandomAccessFile
- /// object. The file header is read to acquire the image size.
- ///
- ///
- /// From where to read the data
- ///
- ///
- /// if an EOF is read
- ///
- /// if an error occurs when opening the file
- ///
- ///
- //UPGRADE_TODO: Class 'java.io.RandomAccessFile' was converted to 'System.IO.FileStream' which has a different behavior. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1073_javaioRandomAccessFile'"
- private ImgReaderPPM(System.IO.FileStream in_Renamed)
- {
- this.in_Renamed = in_Renamed;
-
- confirmFileType();
- skipCommentAndWhiteSpace();
- w = readHeaderInt();
- skipCommentAndWhiteSpace();
- h = readHeaderInt();
- skipCommentAndWhiteSpace();
- /*Read the highest pixel value from header (not used)*/
- readHeaderInt();
- nc = 3;
- rb = 8;
- }
-
- /// Closes the underlying file from where the image data is being read. No
- /// operations are possible after a call to this method.
- ///
- ///
- /// If an I/O error occurs.
- ///
- ///
- public override void close()
- {
- in_Renamed.Close();
- in_Renamed = null;
- // Free memory
- barr[0] = null;
- barr[1] = null;
- barr[2] = null;
- buf = null;
- }
-
-
- /// Returns the number of bits corresponding to the nominal range of the
- /// data in the specified component. This is the value rb (range bits) that
- /// was specified in the constructor, which normally is 8 for non bilevel
- /// data, and 1 for bilevel data.
- ///
- /// If this number is b then the nominal range is between
- /// -2^(b-1) and 2^(b-1)-1, since unsigned data is level shifted to have a
- /// nominal avergae of 0.
- ///
- ///
- /// The index of the component.
- ///
- ///
- /// The number of bits corresponding to the nominal range of the
- /// data. For floating-point data this value is not applicable and the
- /// return value is undefined.
- ///
- ///
- public override int getNomRangeBits(int c)
- {
- // Check component index
- if (c < 0 || c > 2)
- throw new System.ArgumentException();
-
- return rb;
- }
-
- /// Returns the position of the fixed point in the specified component
- /// (i.e. the number of fractional bits), which is always 0 for this
- /// ImgReader.
- ///
- ///
- /// The index of the component.
- ///
- ///
- /// The position of the fixed-point (i.e. the number of fractional
- /// bits). Always 0 for this ImgReader.
- ///
- ///
- public override int getFixedPoint(int c)
- {
- // Check component index
- if (c < 0 || c > 2)
- throw new System.ArgumentException();
- return 0;
- }
-
-
- /// Returns, in the blk argument, the block of image data containing the
- /// specifed rectangular area, in the specified component. The data is
- /// returned, as a reference to the internal data, if any, instead of as a
- /// copy, therefore the returned data should not be modified.
- ///
- /// After being read the coefficients are level shifted by subtracting
- /// 2^(nominal bit range - 1)
- ///
- ///
The rectangular area to return is specified by the 'ulx', 'uly', 'w'
- /// and 'h' members of the 'blk' argument, relative to the current
- /// tile. These members are not modified by this method. The 'offset' and
- /// 'scanw' of the returned data can be arbitrary. See the 'DataBlk' class.
- ///
- ///
If the data array in blk is null, then a new one
- /// is created if necessary. The implementation of this interface may
- /// choose to return the same array or a new one, depending on what is more
- /// efficient. Therefore, the data array in blk prior to the
- /// method call should not be considered to contain the returned data, a
- /// new array may have been created. Instead, get the array from
- /// blk after the method has returned.
- ///
- ///
The returned data always has its 'progressive' attribute unset
- /// (i.e. false).
- ///
- ///
When an I/O exception is encountered the JJ2KExceptionHandler is
- /// used. The exception is passed to its handleException method. The action
- /// that is taken depends on the action that has been registered in
- /// JJ2KExceptionHandler. See JJ2KExceptionHandler for details.
- ///
- ///
This method implements buffering for the 3 components: When the
- /// first one is asked, all the 3 components are read and stored until they
- /// are needed.
- ///
- ///
- /// Its coordinates and dimensions specify the area to
- /// return. Some fields in this object are modified to return the data.
- ///
- ///
- /// The index of the component from which to get the data. Only 0,
- /// 1 and 3 are valid.
- ///
- ///
- /// The requested DataBlk
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public override DataBlk getInternCompData(DataBlk blk, int c)
- {
- // Check component index
- if (c < 0 || c > 2)
- throw new System.ArgumentException();
-
- // Check type of block provided as an argument
- if (blk.DataType != DataBlk.TYPE_INT)
- {
- if (intBlk == null)
- intBlk = new DataBlkInt(blk.ulx, blk.uly, blk.w, blk.h);
- else
- {
- intBlk.ulx = blk.ulx;
- intBlk.uly = blk.uly;
- intBlk.w = blk.w;
- intBlk.h = blk.h;
- }
- blk = intBlk;
- }
-
- // If asking a component for the first time for this block, read the 3
- // components
- if ((barr[c] == null) || (dbi.ulx > blk.ulx) || (dbi.uly > blk.uly) || (dbi.ulx + dbi.w < blk.ulx + blk.w) || (dbi.uly + dbi.h < blk.uly + blk.h))
- {
- int k, j, i, mi;
- int[] red, green, blue;
-
- // Reset data arrays if needed
- if (barr[c] == null || barr[c].Length < blk.w * blk.h)
- {
- barr[c] = new int[blk.w * blk.h];
- }
- blk.Data = barr[c];
-
- i = (c + 1) % 3;
- if (barr[i] == null || barr[i].Length < blk.w * blk.h)
- {
- barr[i] = new int[blk.w * blk.h];
- }
- i = (c + 2) % 3;
- if (barr[i] == null || barr[i].Length < blk.w * blk.h)
- {
- barr[i] = new int[blk.w * blk.h];
- }
-
- // set attributes of the DataBlk used for buffering
- dbi.ulx = blk.ulx;
- dbi.uly = blk.uly;
- dbi.w = blk.w;
- dbi.h = blk.h;
-
- // Check line buffer
- if (buf == null || buf.Length < 3 * blk.w)
- {
- buf = new byte[3 * blk.w];
- }
-
- red = barr[0];
- green = barr[1];
- blue = barr[2];
-
- try
- {
- // Read line by line
- mi = blk.uly + blk.h;
- for (i = blk.uly; i < mi; i++)
- {
- // Reposition in input offset takes care of
- // header offset
- in_Renamed.Seek(offset + i * 3 * w + 3 * blk.ulx, System.IO.SeekOrigin.Begin);
- in_Renamed.Read(buf, 0, 3 * blk.w);
-
- for (k = (i - blk.uly) * blk.w + blk.w - 1, j = 3 * blk.w - 1; j >= 0; k--)
- {
- // Read every third sample
- blue[k] = (((byte)buf[j--]) & 0xFF) - DC_OFFSET;
- green[k] = (((byte)buf[j--]) & 0xFF) - DC_OFFSET;
- red[k] = (((byte)buf[j--]) & 0xFF) - DC_OFFSET;
- }
- }
- }
- catch (System.IO.IOException e)
- {
- JJ2KExceptionHandler.handleException(e);
- }
- barr[0] = red;
- barr[1] = green;
- barr[2] = blue;
-
- // Set buffer attributes
- blk.Data = barr[c];
- blk.offset = 0;
- blk.scanw = blk.w;
- }
- else
- {
- //Asking for the 2nd or 3rd block component
- blk.Data = barr[c];
- blk.offset = (blk.ulx - dbi.ulx) * dbi.w + blk.ulx - dbi.ulx;
- blk.scanw = dbi.scanw;
- }
-
- // Turn off the progressive attribute
- blk.progressive = false;
- return blk;
- }
-
- /// Returns, in the blk argument, a block of image data containing the
- /// specifed rectangular area, in the specified component. The data is
- /// returned, as a copy of the internal data, therefore the returned data
- /// can be modified "in place".
- ///
- /// After being read the coefficients are level shifted by subtracting
- /// 2^(nominal bit range - 1)
- ///
- ///
The rectangular area to return is specified by the 'ulx', 'uly', 'w'
- /// and 'h' members of the 'blk' argument, relative to the current
- /// tile. These members are not modified by this method. The 'offset' of
- /// the returned data is 0, and the 'scanw' is the same as the block's
- /// width. See the 'DataBlk' class.
- ///
- ///
If the data array in 'blk' is 'null', then a new one is created. If
- /// the data array is not 'null' then it is reused, and it must be large
- /// enough to contain the block's data. Otherwise an 'ArrayStoreException'
- /// or an 'IndexOutOfBoundsException' is thrown by the Java system.
- ///
- ///
The returned data has its 'progressive' attribute unset
- /// (i.e. false).
- ///
- ///
When an I/O exception is encountered the JJ2KExceptionHandler is
- /// used. The exception is passed to its handleException method. The action
- /// that is taken depends on the action that has been registered in
- /// JJ2KExceptionHandler. See JJ2KExceptionHandler for details.
- ///
- ///
- /// Its coordinates and dimensions specify the area to
- /// return. If it contains a non-null data array, then it must have the
- /// correct dimensions. If it contains a null data array a new one is
- /// created. The fields in this object are modified to return the data.
- ///
- ///
- /// The index of the component from which to get the data. Only
- /// 0,1 and 2 are valid.
- ///
- ///
- /// The requested DataBlk
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public override DataBlk getCompData(DataBlk blk, int c)
- {
- // NOTE: can not directly call getInterCompData since that returns
- // internally buffered data.
- int ulx, uly, w, h;
-
- // Check type of block provided as an argument
- if (blk.DataType != DataBlk.TYPE_INT)
- {
- DataBlkInt tmp = new DataBlkInt(blk.ulx, blk.uly, blk.w, blk.h);
- blk = tmp;
- }
-
- int[] bakarr = (int[])blk.Data;
- // Save requested block size
- ulx = blk.ulx;
- uly = blk.uly;
- w = blk.w;
- h = blk.h;
- // Force internal data buffer to be different from external
- blk.Data = null;
- getInternCompData(blk, c);
- // Copy the data
- if (bakarr == null)
- {
- bakarr = new int[w * h];
- }
- if (blk.offset == 0 && blk.scanw == w)
- {
- // Requested and returned block buffer are the same size
- // CONVERSION PROBLEM?
- Array.Copy((System.Array)blk.Data, 0, (System.Array)bakarr, 0, w * h);
- }
- else
- {
- // Requested and returned block are different
- for (int i = h - 1; i >= 0; i--)
- {
- // copy line by line
- // CONVERSION PROBLEM?
- Array.Copy((System.Array)blk.Data, blk.offset + i * blk.scanw, (System.Array)bakarr, i * w, w);
- }
- }
- blk.Data = bakarr;
- blk.offset = 0;
- blk.scanw = blk.w;
- return blk;
- }
-
- /// Returns a byte read from the RandomAccessFile. The number of read byted
- /// are counted to keep track of the offset of the pixel data in the PPM
- /// file
- ///
- ///
- /// One byte read from the header of the PPM file.
- ///
- ///
- private byte countedByteRead()
- {
- offset++;
- return (byte)in_Renamed.ReadByte();
- }
-
- /// Checks that the file begins with 'P6'
- ///
- ///
- private void confirmFileType()
- {
- byte[] type = new byte[] { 80, 54 };
- int i;
- byte b;
-
- for (i = 0; i < 2; i++)
- {
- b = countedByteRead();
- if (b != type[i])
- {
- if (i == 1 && b == 51)
- {
- // i.e 'P3'
- throw new System.ArgumentException("JJ2000 does not support" + " ascii-PPM files. Use " + " raw-PPM file instead. ");
- }
- else
- {
- throw new System.ArgumentException("Not a raw-PPM file");
- }
- }
- }
- }
-
- /// Skips any line in the header starting with '#' and any space, tab, line
- /// feed or carriage return.
- ///
- ///
- private void skipCommentAndWhiteSpace()
- {
-
- bool done = false;
- byte b;
-
- while (!done)
- {
- b = countedByteRead();
- if (b == 35)
- {
- // Comment start
- while (b != 10 && b != 13)
- {
- // While not comment end (end-of-line)
- b = countedByteRead();
- }
- }
- else if (!(b == 9 || b == 10 || b == 13 || b == 32))
- {
- // If not whitespace
- done = true;
- }
- }
- // Put back last valid byte
- offset--;
- in_Renamed.Seek(offset, System.IO.SeekOrigin.Begin);
- }
-
- /// Returns an int read from the header of the PPM file.
- ///
- ///
- /// One int read from the header of the PPM file.
- ///
- ///
- private int readHeaderInt()
- {
- int res = 0;
- byte b = 0;
-
- b = countedByteRead();
- while (b != 32 && b != 10 && b != 9 && b != 13)
- {
- // While not whitespace
- res = res * 10 + b - 48; // Convert from ASCII to decimal
- b = countedByteRead();
- }
- return res;
- }
-
- /// Returns true if the data read was originally signed in the specified
- /// component, false if not. This method always returns false since PPM
- /// data is always unsigned.
- ///
- ///
- /// The index of the component, from 0 to N-1.
- ///
- ///
- /// always false, since PPM data is always unsigned.
- ///
- ///
- public override bool isOrigSigned(int c)
- {
- // Check component index
- if (c < 0 || c > 2)
- throw new System.ArgumentException();
- return false;
- }
-
- /// Returns a string of information about the object, more than 1 line
- /// long. The information string includes information from the underlying
- /// RandomAccessFile (its toString() method is called in turn).
- ///
- ///
- /// A string of information about the object.
- ///
- ///
- public override System.String ToString()
- {
- //UPGRADE_TODO: The equivalent in .NET for method 'java.lang.Object.toString' may return a different value. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1043'"
- return "ImgReaderPPM: WxH = " + w + "x" + h + ", Component = 0,1,2" + "\nUnderlying RandomAccessFile:\n" + in_Renamed.ToString();
- }
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/image/invcomptransf/InvCompTransf.cs b/CSJ2K/j2k/image/invcomptransf/InvCompTransf.cs
deleted file mode 100644
index 2a2bca98..00000000
--- a/CSJ2K/j2k/image/invcomptransf/InvCompTransf.cs
+++ /dev/null
@@ -1,809 +0,0 @@
-/*
-* CVS Identifier:
-*
-* $Id: InvCompTransf.java,v 1.19 2001/10/29 20:06:35 qtxjoas Exp $
-*
-* Class: InvCompTransf
-*
-* Description: Inverse Component transformations applied to tiles
-*
-*
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-* */
-using CSJ2K.j2k.decoder;
-using CSJ2K.j2k.util;
-using CSJ2K.j2k.wavelet.synthesis;
-using System;
-namespace CSJ2K.j2k.image.invcomptransf
-{
-
- /// This class apply inverse component transformations to the tiles depending
- /// on specification read from the codestream header. These transformations can
- /// be used to improve compression efficiency but are not related to colour
- /// transforms used to map colour values for display purposes. JPEG 2000 part I
- /// defines 2 component transformations: RCT (Reversible Component
- /// Transformation) and ICT (Irreversible Component Transformation).
- ///
- ///
- ///
- ///
- ///
- public class InvCompTransf : ImgDataAdapter, BlkImgDataSrc
- {
- /// Returns the parameters that are used in this class and implementing
- /// classes. It returns a 2D String array. Each of the 1D arrays is for a
- /// different option, and they have 4 elements. The first element is the
- /// option name, the second one is the synopsis, the third one is a long
- /// description of what the parameter is and the fourth is its default
- /// value. The synopsis or description may be 'null', in which case it is
- /// assumed that there is no synopsis or description of the option,
- /// respectively. Null may be returned if no options are supported.
- ///
- ///
- /// the options name, their synopsis and their explanation,
- /// or null if no options are supported.
- ///
- ///
- public static System.String[][] ParameterInfo
- {
- get
- {
- return pinfo;
- }
-
- }
- /// Returns true if this transform is reversible in current
- /// tile. Reversible component transformations are those which operation
- /// can be completely reversed without any loss of information (not even
- /// due to rounding).
- ///
- ///
- /// Reversibility of component transformation in current
- /// tile
- ///
- ///
- virtual public bool Reversible
- {
- get
- {
- switch (transfType)
- {
-
- case NONE:
- case INV_RCT:
- return true;
-
- case INV_ICT:
- return false;
-
- default:
- throw new System.ArgumentException("Non JPEG 2000 part I" + " component transformation");
-
- }
- }
-
- }
-
- /// Identifier for no component transformation. Value is 0.
- public const int NONE = 0;
-
- /// The prefix for inverse component transformation options: 'M'
- public const char OPT_PREFIX = 'M';
-
- /// The list of parameters that is accepted by the inverse
- /// component transformation module. They start with 'M'.
- ///
- //UPGRADE_NOTE: Final was removed from the declaration of 'pinfo'. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private static readonly System.String[][] pinfo = null;
-
- /// Identifier for the Inverse Reversible Component Transformation
- /// (INV_RCT). Value is 1.
- ///
- public const int INV_RCT = 1;
-
- /// Identifier for the Inverse Irreversible Component
- /// Transformation (INV_ICT). Value is 2
- ///
- public const int INV_ICT = 2;
-
- /// The source of image data
- private BlkImgDataSrc src;
-
- /// The component transformations specifications
- private CompTransfSpec cts;
-
- /// The wavelet filter specifications
- private SynWTFilterSpec wfs;
-
- /// The type of the current component transformation JPEG 2000
- /// part I only support NONE, FORW_RCT and FORW_ICT types
- ///
- private int transfType = NONE;
-
- /// Buffer for each component of output data
- private int[][] outdata = new int[3][];
-
- /// Block used to request component 0
- private DataBlk block0;
-
- /// Block used to request component 1
- private DataBlk block1;
-
- /// Block used to request component 2
- private DataBlk block2;
-
- /// Data block used only to store coordinates and progressiveness
- /// of the buffered blocks
- ///
- private DataBlkInt dbi = new DataBlkInt();
-
- /// The bit-depths of un-transformed components
- private int[] utdepth;
-
- /// Flag indicating whether the decoder should skip the component
- /// transform
- ///
- private bool noCompTransf = false;
-
- /// Constructs a new ForwCompTransf object that operates on the
- /// specified source of image data.
- ///
- ///
- /// The source from where to get the data to be
- /// transformed
- ///
- ///
- /// The decoder specifications
- ///
- ///
- /// The bit depth of the un-transformed components
- ///
- ///
- /// The command line optinons of the decoder
- ///
- ///
- ///
- ///
- ///
- public InvCompTransf(BlkImgDataSrc imgSrc, DecoderSpecs decSpec, int[] utdepth, ParameterList pl) : base(imgSrc)
- {
- this.cts = decSpec.cts;
- this.wfs = decSpec.wfs;
- src = imgSrc;
- this.utdepth = utdepth;
- noCompTransf = !(pl.getBooleanParameter("comp_transf"));
- }
-
- /// Returns a string with a descriptive text of which inverse component
- /// transformation is used. This can be either "Inverse RCT" or "Inverse
- /// ICT" or "No component transformation" depending on the current tile.
- ///
- ///
- /// A descriptive string
- ///
- ///
- public override System.String ToString()
- {
- switch (transfType)
- {
-
- case INV_RCT:
- return "Inverse RCT";
-
- case INV_ICT:
- return "Inverse ICT";
-
- case NONE:
- return "No component transformation";
-
- default:
- throw new System.ArgumentException("Non JPEG 2000 part I" + " component transformation");
-
- }
- }
-
- /// Returns the position of the fixed point in the specified
- /// component. This is the position of the least significant integral
- /// (i.e. non-fractional) bit, which is equivalent to the number of
- /// fractional bits. For instance, for fixed-point values with 2 fractional
- /// bits, 2 is returned. For floating-point data this value does not apply
- /// and 0 should be returned. Position 0 is the position of the least
- /// significant bit in the data.
- ///
- /// This default implementation assumes that the number of fractional
- /// bits is not modified by the component mixer.
- ///
- ///
- /// The index of the component.
- ///
- ///
- /// The value of the fixed point position of the source since the
- /// color transform does not affect it.
- ///
- ///
- public virtual int getFixedPoint(int c)
- {
- return src.getFixedPoint(c);
- }
-
- /// Calculates the bitdepths of the transformed components, given the
- /// bitdepth of the un-transformed components and the component
- /// tranformation type.
- ///
- ///
- /// The bitdepth of each un-transformed component
- ///
- ///
- /// The type ID of the inverse component tranformation
- ///
- ///
- /// If not null the results are stored in this
- /// array, otherwise a new array is allocated and returned.
- ///
- ///
- /// The bitdepth of each transformed component.
- ///
- ///
- public static int[] calcMixedBitDepths(int[] utdepth, int ttype, int[] tdepth)
- {
-
- if (utdepth.Length < 3 && ttype != NONE)
- {
- throw new System.ArgumentException();
- }
-
- if (tdepth == null)
- {
- tdepth = new int[utdepth.Length];
- }
-
- switch (ttype)
- {
-
- case NONE:
- Array.Copy(utdepth, 0, tdepth, 0, utdepth.Length);
- break;
-
- case INV_RCT:
- if (utdepth.Length > 3)
- {
- Array.Copy(utdepth, 3, tdepth, 3, utdepth.Length - 3);
- }
- // The formulas are:
- // tdepth[0] = ceil(log2(2^(utdepth[0])+2^utdepth[1]+
- // 2^(utdepth[2])))-2+1
- // tdepth[1] = ceil(log2(2^(utdepth[0])+2^(utdepth[1])-1))+1
- // tdepth[2] = ceil(log2(2^(utdepth[1])+2^(utdepth[2])-1))+1
- // The MathUtil.log2(x) function calculates floor(log2(x)), so we
- // use 'MathUtil.log2(2*x-1)+1', which calculates ceil(log2(x))
- // for any x>=1, x integer.
- tdepth[0] = MathUtil.log2((1 << utdepth[0]) + (2 << utdepth[1]) + (1 << utdepth[2]) - 1) - 2 + 1;
- tdepth[1] = MathUtil.log2((1 << utdepth[2]) + (1 << utdepth[1]) - 1) + 1;
- tdepth[2] = MathUtil.log2((1 << utdepth[0]) + (1 << utdepth[1]) - 1) + 1;
- break;
-
- case INV_ICT:
- if (utdepth.Length > 3)
- {
- Array.Copy(utdepth, 3, tdepth, 3, utdepth.Length - 3);
- }
- // The MathUtil.log2(x) function calculates floor(log2(x)), so we
- // use 'MathUtil.log2(2*x-1)+1', which calculates ceil(log2(x))
- // for any x>=1, x integer.
- //UPGRADE_WARNING: Data types in Visual C# might be different. Verify the accuracy of narrowing conversions. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1042'"
- tdepth[0] = MathUtil.log2((int)System.Math.Floor((1 << utdepth[0]) * 0.299072 + (1 << utdepth[1]) * 0.586914 + (1 << utdepth[2]) * 0.114014) - 1) + 1;
- //UPGRADE_WARNING: Data types in Visual C# might be different. Verify the accuracy of narrowing conversions. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1042'"
- tdepth[1] = MathUtil.log2((int)System.Math.Floor((1 << utdepth[0]) * 0.168701 + (1 << utdepth[1]) * 0.331299 + (1 << utdepth[2]) * 0.5) - 1) + 1;
- //UPGRADE_WARNING: Data types in Visual C# might be different. Verify the accuracy of narrowing conversions. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1042'"
- tdepth[2] = MathUtil.log2((int)System.Math.Floor((1 << utdepth[0]) * 0.5 + (1 << utdepth[1]) * 0.418701 + (1 << utdepth[2]) * 0.081299) - 1) + 1;
- break;
- }
-
- return tdepth;
- }
-
- /// Returns the number of bits, referred to as the "range bits",
- /// corresponding to the nominal range of the data in the specified
- /// component. If this number is b then for unsigned data the
- /// nominal range is between 0 and 2^b-1, and for signed data it is between
- /// -2^(b-1) and 2^(b-1)-1.
- ///
- ///
- /// The index of the component.
- ///
- ///
- /// The bitdepth of un-transformed component 'c'.
- ///
- ///
- public override int getNomRangeBits(int c)
- {
- return utdepth[c];
- }
-
- /// Apply inverse component transformation associated with the current
- /// tile. If no component transformation has been requested by the user,
- /// data are not modified.
- ///
- /// This method calls the getInternCompData() method, but respects the
- /// definitions of the getCompData() method defined in the BlkImgDataSrc
- /// interface.
- ///
- ///
- /// Determines the rectangular area to return, and the
- /// data is returned in this object.
- ///
- ///
- /// Index of the output component.
- ///
- ///
- /// The requested DataBlk
- ///
- ///
- ///
- ///
- ///
- public virtual DataBlk getCompData(DataBlk blk, int c)
- {
- // If requesting a component whose index is greater than 3 or there is
- // no transform return a copy of data (getInternCompData returns the
- // actual data in those cases)
- if (c >= 3 || transfType == NONE || noCompTransf)
- {
- return src.getCompData(blk, c);
- }
- else
- {
- // We can use getInternCompData (since data is a copy anyways)
- return getInternCompData(blk, c);
- }
- }
-
- /// Apply the inverse component transformation associated with the current
- /// tile. If no component transformation has been requested by the user,
- /// data are not modified. Else, appropriate method is called (invRCT or
- /// invICT).
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- /// Determines the rectangular area to return.
- ///
- ///
- /// Index of the output component.
- ///
- ///
- /// The requested DataBlk
- ///
- ///
- public virtual DataBlk getInternCompData(DataBlk blk, int c)
- {
- // if specified in the command line that no component transform should
- // be made, return original data
- if (noCompTransf)
- return src.getInternCompData(blk, c);
-
- switch (transfType)
- {
-
- case NONE:
- return src.getInternCompData(blk, c);
-
-
- case INV_RCT:
- return invRCT(blk, c);
-
- case INV_ICT:
- return invICT(blk, c);
-
- default:
- throw new System.ArgumentException("Non JPEG 2000 part I" + " component transformation");
-
- }
- }
-
- /// Apply inverse component transformation to obtain requested component
- /// from specified block of data. Whatever the type of requested DataBlk,
- /// it always returns a DataBlkInt.
- ///
- ///
- /// Determine the rectangular area to return
- ///
- ///
- /// The index of the requested component
- ///
- ///
- /// Data of requested component
- ///
- ///
- private DataBlk invRCT(DataBlk blk, int c)
- {
- // If the component number is three or greater, return original data
- if (c >= 3 && c < NumComps)
- {
- // Requesting a component whose index is greater than 3
- return src.getInternCompData(blk, c);
- }
- // If asking a component for the first time for this block,
- // do transform for the 3 components
- else if ((outdata[c] == null) || (dbi.ulx > blk.ulx) || (dbi.uly > blk.uly) || (dbi.ulx + dbi.w < blk.ulx + blk.w) || (dbi.uly + dbi.h < blk.uly + blk.h))
- {
- int k, k0, k1, k2, mink, i;
- int w = blk.w; //width of output block
- int h = blk.h; //height of ouput block
-
- //Reference to output block data array
- outdata[c] = (int[])blk.Data;
-
- //Create data array of blk if necessary
- if (outdata[c] == null || outdata[c].Length != h * w)
- {
- outdata[c] = new int[h * w];
- blk.Data = outdata[c];
- }
-
- outdata[(c + 1) % 3] = new int[outdata[c].Length];
- outdata[(c + 2) % 3] = new int[outdata[c].Length];
-
- if (block0 == null || block0.DataType != DataBlk.TYPE_INT)
- block0 = new DataBlkInt();
- if (block1 == null || block1.DataType != DataBlk.TYPE_INT)
- block1 = new DataBlkInt();
- if (block2 == null || block2.DataType != DataBlk.TYPE_INT)
- block2 = new DataBlkInt();
- block0.w = block1.w = block2.w = blk.w;
- block0.h = block1.h = block2.h = blk.h;
- block0.ulx = block1.ulx = block2.ulx = blk.ulx;
- block0.uly = block1.uly = block2.uly = blk.uly;
-
- int[] data0, data1, data2; // input data arrays
-
- // Fill in buffer blocks (to be read only)
- // Returned blocks may have different size and position
- block0 = (DataBlkInt)src.getInternCompData(block0, 0);
- data0 = (int[])block0.Data;
- block1 = (DataBlkInt)src.getInternCompData(block1, 1);
- data1 = (int[])block1.Data;
- block2 = (DataBlkInt)src.getInternCompData(block2, 2);
- data2 = (int[])block2.Data;
-
- // Set the progressiveness of the output data
- blk.progressive = block0.progressive || block1.progressive || block2.progressive;
- blk.offset = 0;
- blk.scanw = w;
-
- // set attributes of the DataBlk used for buffering
- dbi.progressive = blk.progressive;
- dbi.ulx = blk.ulx;
- dbi.uly = blk.uly;
- dbi.w = blk.w;
- dbi.h = blk.h;
-
- // Perform conversion
-
- // Initialize general indexes
- k = w * h - 1;
- k0 = block0.offset + (h - 1) * block0.scanw + w - 1;
- k1 = block1.offset + (h - 1) * block1.scanw + w - 1;
- k2 = block2.offset + (h - 1) * block2.scanw + w - 1;
-
- for (i = h - 1; i >= 0; i--)
- {
- for (mink = k - w; k > mink; k--, k0--, k1--, k2--)
- {
- outdata[1][k] = (data0[k0] - ((data1[k1] + data2[k2]) >> 2));
- outdata[0][k] = data2[k2] + outdata[1][k];
- outdata[2][k] = data1[k1] + outdata[1][k];
- }
- // Jump to beggining of previous line in input
- k0 -= (block0.scanw - w);
- k1 -= (block1.scanw - w);
- k2 -= (block2.scanw - w);
- }
- outdata[c] = null;
- }
- else if ((c >= 0) && (c < 3))
- {
- //Asking for the 2nd or 3rd block component
- blk.Data = outdata[c];
- blk.progressive = dbi.progressive;
- blk.offset = (blk.uly - dbi.uly) * dbi.w + blk.ulx - dbi.ulx;
- blk.scanw = dbi.w;
- outdata[c] = null;
- }
- else
- {
- // Requesting a non valid component index
- throw new System.ArgumentException();
- }
- return blk;
- }
-
- /// Apply inverse irreversible component transformation to obtain requested
- /// component from specified block of data. Whatever the type of requested
- /// DataBlk, it always returns a DataBlkFloat.
- ///
- ///
- /// Determine the rectangular area to return
- ///
- ///
- /// The index of the requested component
- ///
- ///
- /// Data of requested component
- ///
- ///
- private DataBlk invICT(DataBlk blk, int c)
- {
- if (c >= 3 && c < NumComps)
- {
- // Requesting a component whose index is greater than 3
- int k, k0, mink, i; // k1, k2 removed
- int w = blk.w; //width of output block
- int h = blk.h; //height of ouput block
-
- int[] out_data; // array of output data
-
- //Reference to output block data array
- out_data = (int[])blk.Data;
-
- //Create data array of blk if necessary
- if (out_data == null)
- {
- out_data = new int[h * w];
- blk.Data = out_data;
- }
-
- // Variables
- DataBlkFloat indb = new DataBlkFloat(blk.ulx, blk.uly, w, h);
- float[] indata; // input data array
-
- // Get the input data
- // (returned block may be larger than requested one)
- src.getInternCompData(indb, c);
- indata = (float[])indb.Data;
-
- // Copy the data converting from int to int
- k = w * h - 1;
- k0 = indb.offset + (h - 1) * indb.scanw + w - 1;
- for (i = h - 1; i >= 0; i--)
- {
- for (mink = k - w; k > mink; k--, k0--)
- {
- //UPGRADE_WARNING: Data types in Visual C# might be different. Verify the accuracy of narrowing conversions. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1042'"
- out_data[k] = (int)(indata[k0]);
- }
- // Jump to beggining of previous line in input
- k0 -= (indb.scanw - w);
- }
-
- // Set the progressivity and offset
- blk.progressive = indb.progressive;
- blk.offset = 0;
- blk.scanw = w;
- }
- // If asking a component for the first time for this block,
- // do transform for the 3 components
- else if ((outdata[c] == null) || (dbi.ulx > blk.ulx) || (dbi.uly > blk.uly) || (dbi.ulx + dbi.w < blk.ulx + blk.w) || (dbi.uly + dbi.h < blk.uly + blk.h))
- {
- int k, k0, k1, k2, mink, i;
- int w = blk.w; //width of output block
- int h = blk.h; //height of ouput block
-
- //Reference to output block data array
- outdata[c] = (int[])blk.Data;
-
- //Create data array of blk if necessary
- if (outdata[c] == null || outdata[c].Length != w * h)
- {
- outdata[c] = new int[h * w];
- blk.Data = outdata[c];
- }
-
- outdata[(c + 1) % 3] = new int[outdata[c].Length];
- outdata[(c + 2) % 3] = new int[outdata[c].Length];
-
- if (block0 == null || block0.DataType != DataBlk.TYPE_FLOAT)
- block0 = new DataBlkFloat();
- if (block2 == null || block2.DataType != DataBlk.TYPE_FLOAT)
- block2 = new DataBlkFloat();
- if (block1 == null || block1.DataType != DataBlk.TYPE_FLOAT)
- block1 = new DataBlkFloat();
- block0.w = block2.w = block1.w = blk.w;
- block0.h = block2.h = block1.h = blk.h;
- block0.ulx = block2.ulx = block1.ulx = blk.ulx;
- block0.uly = block2.uly = block1.uly = blk.uly;
-
- float[] data0, data1, data2; // input data arrays
-
- // Fill in buffer blocks (to be read only)
- // Returned blocks may have different size and position
- block0 = (DataBlkFloat)src.getInternCompData(block0, 0);
- data0 = (float[])block0.Data;
- block2 = (DataBlkFloat)src.getInternCompData(block2, 1);
- data2 = (float[])block2.Data;
- block1 = (DataBlkFloat)src.getInternCompData(block1, 2);
- data1 = (float[])block1.Data;
-
- // Set the progressiveness of the output data
- blk.progressive = block0.progressive || block1.progressive || block2.progressive;
- blk.offset = 0;
- blk.scanw = w;
-
- // set attributes of the DataBlk used for buffering
- dbi.progressive = blk.progressive;
- dbi.ulx = blk.ulx;
- dbi.uly = blk.uly;
- dbi.w = blk.w;
- dbi.h = blk.h;
-
- //Perform conversion
-
- // Initialize general indexes
- k = w * h - 1;
- k0 = block0.offset + (h - 1) * block0.scanw + w - 1;
- k2 = block2.offset + (h - 1) * block2.scanw + w - 1;
- k1 = block1.offset + (h - 1) * block1.scanw + w - 1;
-
- for (i = h - 1; i >= 0; i--)
- {
- for (mink = k - w; k > mink; k--, k0--, k2--, k1--)
- {
- //UPGRADE_WARNING: Data types in Visual C# might be different. Verify the accuracy of narrowing conversions. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1042'"
- outdata[0][k] = (int)(data0[k0] + 1.402f * data1[k1] + 0.5f);
- //UPGRADE_WARNING: Data types in Visual C# might be different. Verify the accuracy of narrowing conversions. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1042'"
- outdata[1][k] = (int)(data0[k0] - 0.34413f * data2[k2] - 0.71414f * data1[k1] + 0.5f);
- //UPGRADE_WARNING: Data types in Visual C# might be different. Verify the accuracy of narrowing conversions. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1042'"
- outdata[2][k] = (int)(data0[k0] + 1.772f * data2[k2] + 0.5f);
- }
- // Jump to beggining of previous line in input
- k0 -= (block0.scanw - w);
- k2 -= (block2.scanw - w);
- k1 -= (block1.scanw - w);
- }
- outdata[c] = null;
- }
- else if ((c >= 0) && (c <= 3))
- {
- //Asking for the 2nd or 3rd block component
- blk.Data = outdata[c];
- blk.progressive = dbi.progressive;
- blk.offset = (blk.uly - dbi.uly) * dbi.w + blk.ulx - dbi.ulx;
- blk.scanw = dbi.w;
- outdata[c] = null;
- }
- else
- {
- // Requesting a non valid component index
- throw new System.ArgumentException();
- }
- return blk;
- }
-
- /// Changes the current tile, given the new indexes. An
- /// IllegalArgumentException is thrown if the indexes do not
- /// correspond to a valid tile.
- ///
- /// This default implementation changes the tile in the source
- /// and re-initializes properly component transformation variables..
- ///
- ///
- /// The horizontal index of the tile.
- ///
- ///
- /// The vertical index of the new tile.
- ///
- ///
- ///
- public override void setTile(int x, int y)
- {
- src.setTile(x, y);
- tIdx = TileIdx; // index of the current tile
-
- // initializations
- if (((System.Int32)cts.getTileDef(tIdx)) == NONE)
- transfType = NONE;
- else
- {
- int nc = src.NumComps > 3 ? 3 : src.NumComps;
- int rev = 0;
- for (int c = 0; c < nc; c++)
- {
- rev += (wfs.isReversible(tIdx, c) ? 1 : 0);
- }
- if (rev == 3)
- {
- // All WT are reversible
- transfType = INV_RCT;
- }
- else if (rev == 0)
- {
- // All WT irreversible
- transfType = INV_ICT;
- }
- else
- {
- // Error
- throw new System.ArgumentException("Wavelet transformation and " + "component transformation" + " not coherent in tile" + tIdx);
- }
- }
- }
-
- /// Advances to the next tile, in standard scan-line order (by rows
- /// then columns). An NoNextElementException is thrown if the
- /// current tile is the last one (i.e. there is no next tile).
- ///
- /// This default implementation just advances to the next tile
- /// in the source and re-initializes properly component
- /// transformation variables.
- ///
- ///
- ///
- public override void nextTile()
- {
- src.nextTile();
- tIdx = TileIdx; // index of the current tile
-
- // initializations
- if (((System.Int32)cts.getTileDef(tIdx)) == NONE)
- transfType = NONE;
- else
- {
- int nc = src.NumComps > 3 ? 3 : src.NumComps;
- int rev = 0;
- for (int c = 0; c < nc; c++)
- {
- rev += (wfs.isReversible(tIdx, c) ? 1 : 0);
- }
- if (rev == 3)
- {
- // All WT are reversible
- transfType = INV_RCT;
- }
- else if (rev == 0)
- {
- // All WT irreversible
- transfType = INV_ICT;
- }
- else
- {
- // Error
- throw new System.ArgumentException("Wavelet transformation and " + "component transformation" + " not coherent in tile" + tIdx);
- }
- }
- }
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/image/output/ImgWriter.cs b/CSJ2K/j2k/image/output/ImgWriter.cs
deleted file mode 100644
index d79a7bd5..00000000
--- a/CSJ2K/j2k/image/output/ImgWriter.cs
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
-* CVS identifier:
-*
-* $Id: ImgWriter.java,v 1.12 2001/09/14 09:13:11 grosbois Exp $
-*
-* Class: ImgWriter
-*
-* Description: Generic interface for all image writer
-* classes (to file or other resource)
-*
-*
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-* */
-using System;
-namespace CSJ2K.j2k.image.output
-{
-
- /// This is the generic interface to be implemented by all image file (or other
- /// resource) writers for different formats.
- ///
- /// Each object inheriting from this class should have a source ImgData
- /// object associated with it. The image data to write to the file is obtained
- /// from the associated ImgData object. In general this object would be
- /// specified at construction time.
- ///
- /// Depending on the actual type of file that is written a call to any
- /// write() or writeAll() method will write data from one component, several
- /// components or all components. For example, a PGM writer will write data
- /// from only one component (defined in the constructor) while a PPM writer
- /// will write 3 components (normally R,G,B).
- ///
- ///
- public abstract class ImgWriter
- {
-
- /// The defaukt height used when writing strip by strip in the 'write()'
- /// method. It is 64.
- ///
- public const int DEF_STRIP_HEIGHT = 64;
-
- /// The source ImagaData object, from where to get the image data
- protected internal BlkImgDataSrc src;
-
- /// The width of the image
- protected internal int w;
-
- /// The height of the image
- protected internal int h;
-
- /// Closes the underlying file or netwrok connection to where the data is
- /// written. The implementing class must write all buffered data before
- /// closing the file or resource. Any call to other methods of the class
- /// become illegal after a call to this one.
- ///
- ///
- /// If an I/O error occurs.
- ///
- ///
- public abstract void close();
-
- /// Writes all buffered data to the file or resource. If the implementing
- /// class does onot use buffering nothing should be done.
- ///
- ///
- /// If an I/O error occurs.
- ///
- ///
- public abstract void flush();
-
- /// Flushes the buffered data before the object is garbage collected. If an
- /// exception is thrown the object finalization is halted, but is otherwise
- /// ignored.
- ///
- ///
- /// If an I/O error occurs. It halts the
- /// finalization of the object, but is otherwise ignored.
- ///
- ///
- ///
- ///
- ///
- ~ImgWriter()
- {
- flush();
- }
-
- /// Writes the source's current tile to the output. The requests of data
- /// issued by the implementing class to the source ImgData object should be
- /// done by blocks or strips, in order to reduce memory usage.
- ///
- /// The implementing class should only write data that is not
- /// "progressive" (in other words that it is final), see DataBlk for
- /// details.
- ///
- ///
- /// If an I/O error occurs.
- ///
- ///
- ///
- ///
- ///
- public abstract void write();
-
- /// Writes the entire image or only specified tiles to the output. The
- /// implementation in this class calls the write() method for each tile
- /// starting with the upper-left one and proceding in standard scanline
- /// order. It changes the current tile of the source data.
- ///
- ///
- /// If an I/O error occurs.
- ///
- ///
- ///
- ///
- ///
- public virtual void writeAll()
- {
- // Find the list of tile to decode.
- Coord nT = src.getNumTiles(null);
-
- // Loop on vertical tiles
- for (int y = 0; y < nT.y; y++)
- {
- // Loop on horizontal tiles
- for (int x = 0; x < nT.x; x++)
- {
- src.setTile(x, y);
- write();
- } // End loop on horizontal tiles
- } // End loop on vertical tiles
- }
-
- /// Writes the data of the specified area to the file, coordinates are
- /// relative to the current tile of the source.
- ///
- /// The implementing class should only write data that is not
- /// "progressive" (in other words that is final), see DataBlk for
- /// details.
- ///
- ///
- /// The horizontal coordinate of the upper-left corner of the
- /// area to write, relative to the current tile.
- ///
- ///
- /// The vertical coordinate of the upper-left corner of the area
- /// to write, relative to the current tile.
- ///
- ///
- /// The width of the area to write.
- ///
- ///
- /// The height of the area to write.
- ///
- ///
- /// If an I/O error occurs.
- ///
- ///
- public abstract void write(int ulx, int uly, int w, int h);
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/image/output/ImgWriterPGM.cs b/CSJ2K/j2k/image/output/ImgWriterPGM.cs
deleted file mode 100644
index c30d7ff6..00000000
--- a/CSJ2K/j2k/image/output/ImgWriterPGM.cs
+++ /dev/null
@@ -1,415 +0,0 @@
-/*
-* CVS identifier:
-*
-* $Id: ImgWriterPGM.java,v 1.14 2002/07/19 14:13:38 grosbois Exp $
-*
-* Class: ImgWriterRawPGM
-*
-* Description: Image writer for unsigned 8 bit data in
-* PGM file format.
-*
-*
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-* */
-using CSJ2K.j2k.util;
-namespace CSJ2K.j2k.image.output
-{
-
- /// This class writes a component from an image in 8 bit unsigned data to a
- /// binary PGM file. The size of the image that is written to the file is the
- /// size of the component from which to get the data, not the size of the
- /// source image (they differ if there is some sub-sampling).
- ///
- /// Before writing, all coefficients are inversly level shifted and then
- /// "saturated" (they are limited to the nominal dynamic range).
Ex:
- /// if the nominal range is 0-255, the following algorithm is applied:
- /// if coeff<0, output=0
if coeff>255, output=255
else
- /// output=coeff
- ///
- /// The write() methods of an object of this class may not be called
- /// concurrently from different threads.
- ///
- /// NOTE: This class is not thread safe, for reasons of internal
- /// buffering.
- ///
- ///
- public class ImgWriterPGM : ImgWriter
- {
-
- /// Value used to inverse level shift
- private int levShift;
-
- /// Where to write the data
- //UPGRADE_TODO: Class 'java.io.RandomAccessFile' was converted to 'System.IO.FileStream' which has a different behavior. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1073_javaioRandomAccessFile'"
- private System.IO.FileStream out_Renamed;
-
- /// The index of the component from where to get the data
- private int c;
-
- /// The number of fractional bits in the source data
- private int fb;
-
- /// A DataBlk, just used to avoid allocating a new one each time
- /// it is needed
- ///
- private DataBlkInt db = new DataBlkInt();
-
- /// The offset of the raw pixel data in the PGM file
- private int offset;
-
- /// The line buffer.
- // This makes the class not thrad safe
- // (but it is not the only one making it so)
- private byte[] buf;
-
- /// Creates a new writer to the specified File object, to write data from
- /// the specified component.
- ///
- /// The size of the image that is written to the file is the size of the
- /// component from which to get the data, specified by b, not the size of
- /// the source image (they differ if there is some sub-sampling).
- ///
- ///
- /// The file where to write the data
- ///
- ///
- /// The source from where to get the image data to write.
- ///
- ///
- /// The index of the component from where to get the data.
- ///
- ///
- public ImgWriterPGM(System.IO.FileInfo out_Renamed, BlkImgDataSrc imgSrc, int c)
- {
- // Check that imgSrc is of the correct type
- // Check that the component index is valid
- if (c < 0 || c >= imgSrc.NumComps)
- {
- throw new System.ArgumentException("Invalid number of components");
- }
-
- // Check that imgSrc is of the correct type
- if (imgSrc.getNomRangeBits(c) > 8)
- {
- FacilityManager.getMsgLogger().println("Warning: Component " + c + " has nominal bitdepth " + imgSrc.getNomRangeBits(c) + ". Pixel values will be " + "down-shifted to fit bitdepth of 8 for PGM file", 8, 8);
- }
-
- // Initialize
- bool tmpBool;
- if (System.IO.File.Exists(out_Renamed.FullName))
- tmpBool = true;
- else
- tmpBool = System.IO.Directory.Exists(out_Renamed.FullName);
- bool tmpBool2;
- if (System.IO.File.Exists(out_Renamed.FullName))
- {
- System.IO.File.Delete(out_Renamed.FullName);
- tmpBool2 = true;
- }
- else if (System.IO.Directory.Exists(out_Renamed.FullName))
- {
- System.IO.Directory.Delete(out_Renamed.FullName);
- tmpBool2 = true;
- }
- else
- tmpBool2 = false;
- if (tmpBool && !tmpBool2)
- {
- throw new System.IO.IOException("Could not reset file");
- }
- this.out_Renamed = SupportClass.RandomAccessFileSupport.CreateRandomAccessFile(out_Renamed, "rw");
- src = imgSrc;
- this.c = c;
- w = imgSrc.ImgWidth;
- h = imgSrc.ImgHeight;
- fb = imgSrc.getFixedPoint(c);
- levShift = 1 << (imgSrc.getNomRangeBits(c) - 1);
-
- writeHeaderInfo();
- }
-
- /// Creates a new writer to the specified file, to write data from the
- /// specified component.
- ///
- /// The size of the image that is written to the file is the size of the
- /// component from which to get the data, specified by b, not the size of
- /// the source image (they differ if there is some sub-sampling).
- ///
- ///
- /// The name of the file where to write the data
- ///
- ///
- /// The source from where to get the image data to write.
- ///
- ///
- /// The index of the component from where to get the data.
- ///
- ///
- public ImgWriterPGM(System.String fname, BlkImgDataSrc imgSrc, int c) : this(new System.IO.FileInfo(fname), imgSrc, c)
- {
- }
-
- /// Closes the underlying file or netwrok connection to where the data is
- /// written. Any call to other methods of the class become illegal after a
- /// call to this one.
- ///
- ///
- /// If an I/O error occurs.
- ///
- ///
- public override void close()
- {
- int i;
- // Finish writing the file, writing 0s at the end if the data at end
- // has not been written.
- if (out_Renamed.Length != w * h + offset)
- {
- // Goto end of file
- out_Renamed.Seek(out_Renamed.Length, System.IO.SeekOrigin.Begin);
- // Fill with 0s
- for (i = offset + w * h - (int)out_Renamed.Length; i > 0; i--)
- {
- out_Renamed.WriteByte((System.Byte)0);
- }
- }
- out_Renamed.Close();
- src = null;
- out_Renamed = null;
- db = null;
- }
-
- /// Writes all buffered data to the file or resource.
- ///
- ///
- /// If an I/O error occurs.
- ///
- ///
- public override void flush()
- {
- // No flush needed here since we are using a RandomAccessFile Get rid
- // of line buffer (is this a good choice?)
- buf = null;
- }
-
- /// Writes the data of the specified area to the file, coordinates are
- /// relative to the current tile of the source. Before writing, the
- /// coefficients are limited to the nominal range.
- ///
- /// This method may not be called concurrently from different
- /// threads.
- ///
- /// If the data returned from the BlkImgDataSrc source is progressive,
- /// then it is requested over and over until it is not progressive
- /// anymore.
- ///
- ///
- /// The horizontal coordinate of the upper-left corner of the
- /// area to write, relative to the current tile.
- ///
- ///
- /// The vertical coordinate of the upper-left corner of the area
- /// to write, relative to the current tile.
- ///
- ///
- /// The width of the area to write.
- ///
- ///
- /// The height of the area to write.
- ///
- ///
- /// If an I/O error occurs.
- ///
- ///
- public override void write(int ulx, int uly, int w, int h)
- {
- int k, i, j;
- int fracbits = fb; // In local variable for faster access
- int tOffx, tOffy; // Active tile offset in the X and Y direction
-
- // Initialize db
- db.ulx = ulx;
- db.uly = uly;
- db.w = w;
- db.h = h;
- // Get the current active tile offset
- //UPGRADE_WARNING: Data types in Visual C# might be different. Verify the accuracy of narrowing conversions. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1042'"
- tOffx = src.getCompULX(c) - (int)System.Math.Ceiling(src.ImgULX / (double)src.getCompSubsX(c));
- //UPGRADE_WARNING: Data types in Visual C# might be different. Verify the accuracy of narrowing conversions. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1042'"
- tOffy = src.getCompULY(c) - (int)System.Math.Ceiling(src.ImgULY / (double)src.getCompSubsY(c));
- // Check the array size
- if (db.data_array != null && db.data_array.Length < w * h)
- {
- // A new one will be allocated by getInternCompData()
- db.data_array = null;
- }
- // Request the data and make sure it is not
- // progressive
- do
- {
- db = (DataBlkInt)src.getInternCompData(db, c);
- }
- while (db.progressive);
-
- // variables used during coeff saturation
- int tmp, maxVal = (1 << src.getNomRangeBits(c)) - 1;
-
- // If nominal bitdepth greater than 8, calculate down shift
- int downShift = src.getNomRangeBits(c) - 8;
- if (downShift < 0)
- {
- downShift = 0;
- }
-
- // Check line buffer
- if (buf == null || buf.Length < w)
- {
- buf = new byte[w]; // Expand buffer
- }
-
- // Write line by line
- for (i = 0; i < h; i++)
- {
- // Skip to beggining of line in file
- out_Renamed.Seek(this.offset + this.w * (uly + tOffy + i) + ulx + tOffx, System.IO.SeekOrigin.Begin);
- // Write all bytes in the line
- if (fracbits == 0)
- {
- for (k = db.offset + i * db.scanw + w - 1, j = w - 1; j >= 0; j--, k--)
- {
- tmp = db.data_array[k] + levShift;
- buf[j] = (byte)(((tmp < 0) ? 0 : ((tmp > maxVal) ? maxVal : tmp)) >> downShift);
- }
- }
- else
- {
- for (k = db.offset + i * db.scanw + w - 1, j = w - 1; j >= 0; j--, k--)
- {
- tmp = (db.data_array[k] >> fracbits) + levShift;
- buf[j] = (byte)(((tmp < 0) ? 0 : ((tmp > maxVal) ? maxVal : tmp)) >> downShift);
- }
- }
- out_Renamed.Write(buf, 0, w);
- }
- }
-
- /// Writes the source's current tile to the output. The requests of data
- /// issued to the source BlkImgDataSrc object are done by strips, in order
- /// to reduce memory usage.
- ///
- /// If the data returned from the BlkImgDataSrc source is progressive,
- /// then it is requested over and over until it is not progressive
- /// anymore.
- ///
- ///
- /// If an I/O error occurs.
- ///
- ///
- ///
- ///
- ///
- public override void write()
- {
- int i;
- int tIdx = src.TileIdx;
- int tw = src.getTileCompWidth(tIdx, c); // Tile width
- int th = src.getTileCompHeight(tIdx, c); // Tile height
- // Write in strips
- for (i = 0; i < th; i += DEF_STRIP_HEIGHT)
- {
- write(0, i, tw, (th - i < DEF_STRIP_HEIGHT) ? th - i : DEF_STRIP_HEIGHT);
- }
- }
-
- /// Writes the header info of the PGM file :
- ///
- /// P5
- /// width height
- /// 255
- ///
- ///
- /// If there is an IOException
- ///
- ///
- private void writeHeaderInfo()
- {
- byte[] byteVals;
- int i;
- System.String val;
-
- // write 'P5' to file
- out_Renamed.WriteByte((System.Byte)'P'); // 'P'
- out_Renamed.WriteByte((System.Byte)'5'); // '5'
- out_Renamed.WriteByte((System.Byte)'\n'); // newline
- offset = 3;
- // Write width in ASCII
- val = System.Convert.ToString(w);
- byteVals = System.Text.ASCIIEncoding.ASCII.GetBytes(val);
- for (i = 0; i < byteVals.Length; i++)
- {
- out_Renamed.WriteByte((byte)byteVals[i]);
- offset++;
- }
- out_Renamed.WriteByte((System.Byte)' '); // blank
- offset++;
- // Write height in ASCII
- val = System.Convert.ToString(h);
- byteVals = System.Text.ASCIIEncoding.ASCII.GetBytes(val);
- for (i = 0; i < byteVals.Length; i++)
- {
- out_Renamed.WriteByte((byte)byteVals[i]);
- offset++;
- }
- // Write maxval
- out_Renamed.WriteByte((System.Byte)'\n'); // newline
- out_Renamed.WriteByte((System.Byte)'2'); // '2'
- out_Renamed.WriteByte((System.Byte)'5'); // '5'
- out_Renamed.WriteByte((System.Byte)'5'); // '5'
- out_Renamed.WriteByte((System.Byte)'\n'); // newline
- offset += 5;
- }
-
- /// Returns a string of information about the object, more than 1 line
- /// long. The information string includes information from the underlying
- /// RandomAccessFile (its toString() method is called in turn).
- ///
- ///
- /// A string of information about the object.
- ///
- ///
- public override System.String ToString()
- {
- //UPGRADE_TODO: The equivalent in .NET for method 'java.lang.Object.toString' may return a different value. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1043'"
- return "ImgWriterPGM: WxH = " + w + "x" + h + ", Component=" + c + "\nUnderlying RandomAccessFile:\n" + out_Renamed.ToString();
- }
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/image/output/ImgWriterPGX.cs b/CSJ2K/j2k/image/output/ImgWriterPGX.cs
deleted file mode 100644
index 8423f122..00000000
--- a/CSJ2K/j2k/image/output/ImgWriterPGX.cs
+++ /dev/null
@@ -1,536 +0,0 @@
-/*
-* CVS identifier:
-*
-* $Id: ImgWriterPGX.java,v 1.14 2002/07/19 14:10:46 grosbois Exp $
-*
-* Class: ImgWriterPGX
-*
-* Description: Image Writer for PGX files (custom file format
-* for VM3A)
-*
-*
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-* */
-namespace CSJ2K.j2k.image.output
-{
-
- /// This class extends the ImgWriter abstract class for writing PGX files. PGX
- /// is a custom monochrome file format invented specifically to simplify the
- /// use of VM3A with images of different bit-depths in the range 1 to 31 bits
- /// per pixel.
- ///
- /// The file consists of a one line text header followed by the data.
- ///
- ///
- /// Header: "PG"+ ws +<endianess>+ ws
- /// +[sign]+ws + <bit-depth>+"
- /// "+<width>+" "+<height>+'\n'
- ///
- /// where:
- ///
- /// - ws (white-spaces) is any combination of characters ' ' and
- /// '\t'.
- /// - endianess equals "LM" or "ML"(resp. little-endian or
- /// big-endian)
- /// - sign equals "+" or "-" (resp. unsigned or signed). If omited,
- /// values are supposed to be unsigned.
- /// - bit-depth that can be any number between 1 and 31.
- /// - width and height are the image dimensions (in
- /// pixels).
- ///
- ///
- /// Data: The image binary values appear one after the other (in raster
- /// order) immediately after the last header character ('\n') and are
- /// byte-aligned (they are packed into 1,2 or 4 bytes per sample, depending
- /// upon the bit-depth value).
- ///
- ///
- /// If the data is unsigned, level shifting is applied adding 2^(bit depth
- /// - 1)
- ///
- /// NOTE: This class is not thread safe, for reasons of internal
- /// buffering.
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public class ImgWriterPGX : ImgWriter
- {
-
- /// Used during saturation (2^bitdepth-1 if unsigned, 2^(bitdepth-1)-1 if
- /// signed)
- ///
- internal int maxVal;
-
- /// Used during saturation (0 if unsigned, -2^(bitdepth-1) if signed)
- internal int minVal;
-
- /// Used with level-shiting
- internal int levShift;
-
- /// Whether the data must be signed when writing or not. In the latter
- /// case inverse level shifting must be applied
- ///
- internal bool isSigned;
-
- /// The bit-depth of the input file (must be between 1 and 31)
- private int bitDepth;
-
- /// Where to write the data
- //UPGRADE_TODO: Class 'java.io.RandomAccessFile' was converted to 'System.IO.FileStream' which has a different behavior. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1073_javaioRandomAccessFile'"
- private System.IO.FileStream out_Renamed;
-
- /// The offset of the raw pixel data in the PGX file
- private int offset;
-
- /// A DataBlk, just used to avoid allocating a new one each time it is
- /// needed
- ///
- private DataBlkInt db = new DataBlkInt();
-
- /// The number of fractional bits in the source data
- private int fb;
-
- /// The index of the component from where to get the data
- private int c;
-
- /// The pack length of one sample (in bytes, according to the output
- /// bit-depth
- ///
- private int packBytes;
-
- /// The line buffer.
- // This makes the class not thrad safe
- // (but it is not the only one making it so)
- private byte[] buf;
-
- /// Creates a new writer to the specified File object, to write data from
- /// the specified component.
- ///
- /// The size of the image that is written to the file is the size of the
- /// component from which to get the data, specified by b, not the size of
- /// the source image (they differ if there is some sub-sampling).
- ///
- /// All the header informations are given by the BlkImgDataSrc source
- /// (component width, component height, bit-depth) and sign flag, which are
- /// provided to the constructor. The endianness is always big-endian (MSB
- /// first).
- ///
- ///
- /// The file where to write the data
- ///
- ///
- /// The source from where to get the image data to write.
- ///
- ///
- /// The index of the component from where to get the data.
- ///
- ///
- /// Whether the datas are signed or not (needed only when
- /// writing header).
- ///
- ///
- ///
- ///
- ///
- public ImgWriterPGX(System.IO.FileInfo out_Renamed, BlkImgDataSrc imgSrc, int c, bool isSigned)
- {
- //Initialize
- this.c = c;
- bool tmpBool;
- if (System.IO.File.Exists(out_Renamed.FullName))
- tmpBool = true;
- else
- tmpBool = System.IO.Directory.Exists(out_Renamed.FullName);
- bool tmpBool2;
- if (System.IO.File.Exists(out_Renamed.FullName))
- {
- System.IO.File.Delete(out_Renamed.FullName);
- tmpBool2 = true;
- }
- else if (System.IO.Directory.Exists(out_Renamed.FullName))
- {
- System.IO.Directory.Delete(out_Renamed.FullName);
- tmpBool2 = true;
- }
- else
- tmpBool2 = false;
- if (tmpBool && !tmpBool2)
- {
- throw new System.IO.IOException("Could not reset file");
- }
- this.out_Renamed = SupportClass.RandomAccessFileSupport.CreateRandomAccessFile(out_Renamed, "rw");
- this.isSigned = isSigned;
- src = imgSrc;
- w = src.ImgWidth;
- h = src.ImgHeight;
- fb = imgSrc.getFixedPoint(c);
-
- bitDepth = src.getNomRangeBits(this.c);
- if ((bitDepth <= 0) || (bitDepth > 31))
- {
- throw new System.IO.IOException("PGX supports only bit-depth between " + "1 and 31");
- }
- if (bitDepth <= 8)
- {
- packBytes = 1;
- }
- else if (bitDepth <= 16)
- {
- packBytes = 2;
- }
- else
- {
- // <= 31
- packBytes = 4;
- }
-
- // Writes PGX header
- System.String tmpString = "PG " + "ML " + ((this.isSigned) ? "- " : "+ ") + bitDepth + " " + w + " " + h + "\n"; // component height
-
- byte[] tmpByte = System.Text.ASCIIEncoding.ASCII.GetBytes(tmpString);
- for (int i = 0; i < tmpByte.Length; i++)
- {
- this.out_Renamed.WriteByte((byte)tmpByte[i]);
- }
-
- offset = tmpByte.Length;
- maxVal = this.isSigned ? ((1 << (src.getNomRangeBits(c) - 1)) - 1) : ((1 << src.getNomRangeBits(c)) - 1);
- minVal = this.isSigned ? ((-1) * (1 << (src.getNomRangeBits(c) - 1))) : 0;
-
- levShift = (this.isSigned) ? 0 : 1 << (src.getNomRangeBits(c) - 1);
- }
-
- /// Creates a new writer to the specified file, to write data from the
- /// specified component.
- ///
- /// The size of the image that is written to the file is the size of the
- /// component from which to get the data, specified by b, not the size of
- /// the source image (they differ if there is some sub-sampling).
- ///
- /// All header information is given by the BlkImgDataSrc source
- /// (component width, component height, bit-depth) and sign flag, which are
- /// provided to the constructor. The endianness is always big-endian (MSB
- /// first).
- ///
- ///
- /// The name of the file where to write the data
- ///
- ///
- /// The source from where to get the image data to write.
- ///
- ///
- /// The index of the component from where to get the data.
- ///
- ///
- /// Whether the datas are signed or not (needed only when
- /// writing header).
- ///
- ///
- ///
- ///
- ///
- public ImgWriterPGX(System.String fname, BlkImgDataSrc imgSrc, int c, bool isSigned) : this(new System.IO.FileInfo(fname), imgSrc, c, isSigned)
- {
- }
-
- /// Closes the underlying file or netwrok connection to where the data is
- /// written. Any call to other methods of the class become illegal after a
- /// call to this one.
- ///
- ///
- /// If an I/O error occurs.
- ///
- ///
- public override void close()
- {
- int i;
- // Finish writing the file, writing 0s at the end if the data at end
- // has not been written.
- if (out_Renamed.Length != w * h * packBytes + offset)
- {
- // Goto end of file
- out_Renamed.Seek(out_Renamed.Length, System.IO.SeekOrigin.Begin);
- // Fill with 0s
- for (i = offset + w * h * packBytes - (int)out_Renamed.Length; i > 0; i--)
- {
- out_Renamed.WriteByte((System.Byte)0);
- }
- }
- out_Renamed.Close();
- src = null;
- out_Renamed = null;
- db = null;
- }
-
- /// Writes all buffered data to the file or resource.
- ///
- ///
- /// If an I/O error occurs.
- ///
- ///
- public override void flush()
- {
- // No flush is needed since we use RandomAccessFile
- // Get rid of line buffer (is this a good choice?)
- buf = null;
- }
-
- /// Writes the data of the specified area to the file, coordinates are
- /// relative to the current tile of the source. Before writing, the
- /// coefficients are limited to the nominal range and packed into 1,2 or 4
- /// bytes (according to the bit-depth).
- ///
- /// If the data is unisigned, level shifting is applied adding 2^(bit
- /// depth - 1)
- ///
- /// This method may not be called concurrently from different
- /// threads.
- ///
- /// If the data returned from the BlkImgDataSrc source is progressive,
- /// then it is requested over and over until it is not progressive
- /// anymore.
- ///
- ///
- /// The horizontal coordinate of the upper-left corner of the
- /// area to write, relative to the current tile.
- ///
- ///
- /// The vertical coordinate of the upper-left corner of the area
- /// to write, relative to the current tile.
- ///
- ///
- /// The width of the area to write.
- ///
- ///
- /// The height of the area to write.
- ///
- ///
- /// If an I/O error occurs.
- ///
- ///
- public override void write(int ulx, int uly, int w, int h)
- {
- int k, i, j;
- int fracbits = fb; // In local variable for faster access
- int tOffx, tOffy; // Active tile offset in the X and Y direction
-
- // Initialize db
- db.ulx = ulx;
- db.uly = uly;
- db.w = w;
- db.h = h;
- // Get the current active tile offset
- //UPGRADE_WARNING: Data types in Visual C# might be different. Verify the accuracy of narrowing conversions. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1042'"
- tOffx = src.getCompULX(c) - (int)System.Math.Ceiling(src.ImgULX / (double)src.getCompSubsX(c));
- //UPGRADE_WARNING: Data types in Visual C# might be different. Verify the accuracy of narrowing conversions. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1042'"
- tOffy = src.getCompULY(c) - (int)System.Math.Ceiling(src.ImgULY / (double)src.getCompSubsY(c));
- // Check the array size
- if (db.data_array != null && db.data_array.Length < w * h)
- {
- // A new one will be allocated by getInternCompData()
- db.data_array = null;
- }
- // Request the data and make sure it is not
- // progressive
- do
- {
- db = (DataBlkInt)src.getInternCompData(db, c);
- }
- while (db.progressive);
-
- int tmp;
-
-
- // Check line buffer
- if (buf == null || buf.Length < packBytes * w)
- {
- buf = new byte[packBytes * w]; // Expand buffer
- }
-
- switch (packBytes)
- {
-
-
- case 1: // Samples packed into 1 byte
- // Write line by line
- for (i = 0; i < h; i++)
- {
- // Skip to beggining of line in file
- out_Renamed.Seek(offset + this.w * (uly + tOffy + i) + ulx + tOffx, System.IO.SeekOrigin.Begin);
- // Write all bytes in the line
- if (fracbits == 0)
- {
- for (k = db.offset + i * db.scanw + w - 1, j = w - 1; j >= 0; k--)
- {
- tmp = db.data_array[k] + levShift;
- buf[j--] = (byte)((tmp < minVal) ? minVal : ((tmp > maxVal) ? maxVal : tmp));
- }
- }
- else
- {
- for (k = db.offset + i * db.scanw + w - 1, j = w - 1; j >= 0; k--)
- {
- tmp = (SupportClass.URShift(db.data_array[k], fracbits)) + levShift;
- buf[j--] = (byte)((tmp < minVal) ? minVal : ((tmp > maxVal) ? maxVal : tmp));
- }
- }
- out_Renamed.Write(buf, 0, w);
- }
- break;
-
-
- case 2: // Samples packed in to 2 bytes (short)
- // Write line by line
- for (i = 0; i < h; i++)
- {
-
- // Skip to beggining of line in file
- out_Renamed.Seek(offset + 2 * (this.w * (uly + tOffy + i) + ulx + tOffx), System.IO.SeekOrigin.Begin);
- // Write all bytes in the line
- if (fracbits == 0)
- {
- for (k = db.offset + i * db.scanw + w - 1, j = (w << 1) - 1; j >= 0; k--)
- {
- tmp = db.data_array[k] + levShift;
- tmp = (tmp < minVal) ? minVal : ((tmp > maxVal) ? maxVal : tmp);
- buf[j--] = (byte)tmp; // no need for 0xFF mask since
- // truncation will do it already
- buf[j--] = (byte)(SupportClass.URShift(tmp, 8));
- }
- }
- else
- {
- for (k = db.offset + i * db.scanw + w - 1, j = (w << 1) - 1; j >= 0; k--)
- {
- tmp = (SupportClass.URShift(db.data_array[k], fracbits)) + levShift;
- tmp = (tmp < minVal) ? minVal : ((tmp > maxVal) ? maxVal : tmp);
- buf[j--] = (byte)tmp; // no need for 0xFF mask since
- // truncation will do it already
- buf[j--] = (byte)(SupportClass.URShift(tmp, 8));
- }
- }
- out_Renamed.Write(buf, 0, w << 1);
- }
- break;
-
-
- case 4:
- // Write line by line
- for (i = 0; i < h; i++)
- {
- // Skip to beggining of line in file
- out_Renamed.Seek(offset + 4 * (this.w * (uly + tOffy + i) + ulx + tOffx), System.IO.SeekOrigin.Begin);
- // Write all bytes in the line
- if (fracbits == 0)
- {
- for (k = db.offset + i * db.scanw + w - 1, j = (w << 2) - 1; j >= 0; k--)
- {
- tmp = db.data_array[k] + levShift;
- tmp = (tmp < minVal) ? minVal : ((tmp > maxVal) ? maxVal : tmp);
- buf[j--] = (byte)tmp; // No need to use 0xFF
- buf[j--] = (byte)(SupportClass.URShift(tmp, 8)); // masks since truncation
- buf[j--] = (byte)(SupportClass.URShift(tmp, 16)); // will have already the
- buf[j--] = (byte)(SupportClass.URShift(tmp, 24)); // same effect
- }
- }
- else
- {
- for (k = db.offset + i * db.scanw + w - 1, j = (w << 2) - 1; j >= 0; k--)
- {
- tmp = (SupportClass.URShift(db.data_array[k], fracbits)) + levShift;
- tmp = (tmp < minVal) ? minVal : ((tmp > maxVal) ? maxVal : tmp);
- buf[j--] = (byte)tmp; // No need to use 0xFF
- buf[j--] = (byte)(SupportClass.URShift(tmp, 8)); // masks since truncation
- buf[j--] = (byte)(SupportClass.URShift(tmp, 16)); // will have already the
- buf[j--] = (byte)(SupportClass.URShift(tmp, 24)); // same effect
- }
- }
- out_Renamed.Write(buf, 0, w << 2);
- }
- break;
-
-
- default:
- throw new System.IO.IOException("PGX supports only bit-depth between " + "1 and 31");
-
- }
- }
-
- /// Writes the source's current tile to the output. The requests of data
- /// issued to the source BlkImgDataSrc object are done by strips, in order
- /// to reduce memory usage.
- ///
- /// If the data returned from the BlkImgDataSrc source is progressive,
- /// then it is requested over and over until it is not progressive
- /// anymore.
- ///
- ///
- /// If an I/O error occurs.
- ///
- ///
- ///
- ///
- ///
- public override void write()
- {
- int i;
- int tIdx = src.TileIdx;
- int tw = src.getTileCompWidth(tIdx, c); // Tile width
- int th = src.getTileCompHeight(tIdx, c); // Tile height
- // Write in strips
- for (i = 0; i < th; i += DEF_STRIP_HEIGHT)
- {
- write(0, i, tw, (th - i < DEF_STRIP_HEIGHT) ? th - i : DEF_STRIP_HEIGHT);
- }
- }
-
- /// Returns a string of information about the object, more than 1 line
- /// long. The information string includes information from the underlying
- /// RandomAccessFile (its toString() method is called in turn).
- ///
- ///
- /// A string of information about the object.
- ///
- ///
- public override System.String ToString()
- {
- //UPGRADE_TODO: The equivalent in .NET for method 'java.lang.Object.toString' may return a different value. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1043'"
- return "ImgWriterPGX: WxH = " + w + "x" + h + ", Component = " + c + ", Bit-depth = " + bitDepth + ", signed = " + isSigned + "\nUnderlying RandomAccessFile:\n" + out_Renamed.ToString();
- }
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/image/output/ImgWriterPPM.cs b/CSJ2K/j2k/image/output/ImgWriterPPM.cs
deleted file mode 100644
index 3c926e1d..00000000
--- a/CSJ2K/j2k/image/output/ImgWriterPPM.cs
+++ /dev/null
@@ -1,463 +0,0 @@
-/*
-* CVS identifier:
-*
-* $Id: ImgWriterPPM.java,v 1.16 2002/07/25 15:10:14 grosbois Exp $
-*
-* Class: ImgWriterRawPPM
-*
-* Description: Image writer for unsigned 8 bit data in
-* PPM file format.
-*
-*
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-* */
-namespace CSJ2K.j2k.image.output
-{
-
- /// This class writes 3 components from an image in 8 bit unsigned data to a
- /// binary PPM file.
- ///
- /// The size of the image that is written is the size of the source
- /// image. No component subsampling is allowed in any of the components that
- /// are written to the file.
- ///
- ///
Before writing, all coefficients are inversly level-shifted and then
- /// "saturated" (they are limited * to the nominal dynamic range).
- ///
- /// Ex: if the nominal range is 0-255, the following algorithm is
- /// applied:
- ///
- /// if coeff<0, output=0
- ///
- /// if coeff>255, output=255
- ///
- /// else output=coeff
- ///
- /// The write() methods of an object of this class may not be called
- /// concurrently from different threads.
- ///
- ///
NOTE: This class is not thread safe, for reasons of internal buffering.
- ///
- ///
- public class ImgWriterPPM : ImgWriter
- {
-
- /// Value used to inverse level shift. One for each component
- private int[] levShift = new int[3];
-
- /// Where to write the data
- //UPGRADE_TODO: Class 'java.io.RandomAccessFile' was converted to 'System.IO.FileStream' which has a different behavior. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1073_javaioRandomAccessFile'"
- private System.IO.FileStream out_Renamed;
-
- /// The array of indexes of the components from where to get the data
- private int[] cps = new int[3];
-
- /// The array of the number of fractional bits in the components of the
- /// source data
- ///
- private int[] fb = new int[3];
-
- /// A DataBlk, just used to avoid allocating a new one each time
- /// it is needed
- ///
- private DataBlkInt db = new DataBlkInt();
-
- /// The offset of the raw pixel data in the PPM file
- private int offset;
-
- /// The line buffer.
- // This makes the class not thrad safe
- // (but it is not the only one making it so)
- private byte[] buf;
-
- /// Creates a new writer to the specified File object, to write data from
- /// the specified component.
- ///
- /// The three components that will be written as R, G and B must be
- /// specified through the b1, b2 and b3 arguments.
- ///
- ///
- /// The file where to write the data
- ///
- ///
- /// The source from where to get the image data to write.
- ///
- ///
- /// The index of the first component from where to get the data,
- /// that will be written as the red channel.
- ///
- ///
- /// The index of the second component from where to get the data,
- /// that will be written as the green channel.
- ///
- ///
- /// The index of the third component from where to get the data,
- /// that will be written as the green channel.
- ///
- ///
- ///
- ///
- ///
- public ImgWriterPPM(System.IO.FileInfo out_Renamed, BlkImgDataSrc imgSrc, int n1, int n2, int n3)
- {
- // Check that imgSrc is of the correct type
- // Check that the component index is valid
- if ((n1 < 0) || (n1 >= imgSrc.NumComps) || (n2 < 0) || (n2 >= imgSrc.NumComps) || (n3 < 0) || (n3 >= imgSrc.NumComps) || (imgSrc.getNomRangeBits(n1) > 8) || (imgSrc.getNomRangeBits(n2) > 8) || (imgSrc.getNomRangeBits(n3) > 8))
- {
- throw new System.ArgumentException("Invalid component indexes");
- }
- // Initialize
- w = imgSrc.getCompImgWidth(n1);
- h = imgSrc.getCompImgHeight(n1);
- // Check that all components have same width and height
- if (w != imgSrc.getCompImgWidth(n2) || w != imgSrc.getCompImgWidth(n3) || h != imgSrc.getCompImgHeight(n2) || h != imgSrc.getCompImgHeight(n3))
- {
- throw new System.ArgumentException("All components must have the" + " same dimensions and no" + " subsampling");
- }
- w = imgSrc.ImgWidth;
- h = imgSrc.ImgHeight;
-
- // Continue initialization
- bool tmpBool;
- if (System.IO.File.Exists(out_Renamed.FullName))
- tmpBool = true;
- else
- tmpBool = System.IO.Directory.Exists(out_Renamed.FullName);
- bool tmpBool2;
- if (System.IO.File.Exists(out_Renamed.FullName))
- {
- System.IO.File.Delete(out_Renamed.FullName);
- tmpBool2 = true;
- }
- else if (System.IO.Directory.Exists(out_Renamed.FullName))
- {
- System.IO.Directory.Delete(out_Renamed.FullName);
- tmpBool2 = true;
- }
- else
- tmpBool2 = false;
- if (tmpBool && !tmpBool2)
- {
- throw new System.IO.IOException("Could not reset file");
- }
- this.out_Renamed = SupportClass.RandomAccessFileSupport.CreateRandomAccessFile(out_Renamed, "rw");
- src = imgSrc;
- cps[0] = n1;
- cps[1] = n2;
- cps[2] = n3;
- fb[0] = imgSrc.getFixedPoint(n1);
- fb[1] = imgSrc.getFixedPoint(n2);
- fb[2] = imgSrc.getFixedPoint(n3);
-
- levShift[0] = 1 << (imgSrc.getNomRangeBits(n1) - 1);
- levShift[1] = 1 << (imgSrc.getNomRangeBits(n2) - 1);
- levShift[2] = 1 << (imgSrc.getNomRangeBits(n3) - 1);
-
- writeHeaderInfo();
- }
-
- /// Creates a new writer to the specified file, to write data from the
- /// specified component.
- ///
- /// The three components that will be written as R, G and B must be
- /// specified through the b1, b2 and b3 arguments.
- ///
- ///
- /// The name of the file where to write the data
- ///
- ///
- /// The source from where to get the image data to write.
- ///
- ///
- /// The index of the first component from where to get the data,
- /// that will be written as the red channel.
- ///
- ///
- /// The index of the second component from where to get the data,
- /// that will be written as the green channel.
- ///
- ///
- /// The index of the third component from where to get the data,
- /// that will be written as the green channel.
- ///
- ///
- ///
- ///
- ///
- public ImgWriterPPM(System.String fname, BlkImgDataSrc imgSrc, int n1, int n2, int n3) : this(new System.IO.FileInfo(fname), imgSrc, n1, n2, n3)
- {
- }
-
- /// Closes the underlying file or netwrok connection to where the data is
- /// written. Any call to other methods of the class become illegal after a
- /// call to this one.
- ///
- ///
- /// If an I/O error occurs.
- ///
- ///
- public override void close()
- {
- int i;
- // Finish writing the file, writing 0s at the end if the data at end
- // has not been written.
- if (out_Renamed.Length != 3 * w * h + offset)
- {
- // Goto end of file
- out_Renamed.Seek(out_Renamed.Length, System.IO.SeekOrigin.Begin);
- // Fill with 0s n all the components
- for (i = 3 * w * h + offset - (int)out_Renamed.Length; i > 0; i--)
- {
- out_Renamed.WriteByte((System.Byte)0);
- }
- }
- out_Renamed.Close();
- src = null;
- out_Renamed = null;
- db = null;
- }
-
- /// Writes all buffered data to the file or resource.
- ///
- ///
- /// If an I/O error occurs.
- ///
- ///
- public override void flush()
- {
- // No flush needed here since we are using a RandomAccessFile Get rid
- // of line buffer (is this a good choice?)
- buf = null;
- }
-
- /// Writes the data of the specified area to the file, coordinates are
- /// relative to the current tile of the source. Before writing, the
- /// coefficients are limited to the nominal range.
- ///
- /// This method may not be called concurrently from different
- /// threads.
- ///
- /// If the data returned from the BlkImgDataSrc source is progressive,
- /// then it is requested over and over until it is not progressive
- /// anymore.
- ///
- ///
- /// The horizontal coordinate of the upper-left corner of the
- /// area to write, relative to the current tile.
- ///
- ///
- /// The vertical coordinate of the upper-left corner of the area
- /// to write, relative to the current tile.
- ///
- ///
- /// The width of the area to write.
- ///
- ///
- /// The height of the area to write.
- ///
- ///
- /// If an I/O error occurs.
- ///
- ///
- public override void write(int ulx, int uly, int w, int h)
- {
- int k, j, i, c;
- // In local variables for faster access
- int fracbits;
- // variables used during coeff saturation
- int shift, tmp, maxVal;
- int tOffx, tOffy; // Active tile offset in the X and Y direction
-
- // Active tiles in all components have same offset since they are at
- // same resolution (PPM does not support anything else)
- //UPGRADE_WARNING: Data types in Visual C# might be different. Verify the accuracy of narrowing conversions. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1042'"
- tOffx = src.getCompULX(cps[0]) - (int)System.Math.Ceiling(src.ImgULX / (double)src.getCompSubsX(cps[0]));
- //UPGRADE_WARNING: Data types in Visual C# might be different. Verify the accuracy of narrowing conversions. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1042'"
- tOffy = src.getCompULY(cps[0]) - (int)System.Math.Ceiling(src.ImgULY / (double)src.getCompSubsY(cps[0]));
-
- // Check the array size
- if (db.data_array != null && db.data_array.Length < w)
- {
- // A new one will be allocated by getInternCompData()
- db.data_array = null;
- }
-
- // Check the line buffer
- if (buf == null || buf.Length < 3 * w)
- {
- buf = new byte[3 * w];
- }
-
- // Write the data to the file
- // Write line by line
- for (i = 0; i < h; i++)
- {
- // Write into buffer first loop over the three components and
- // write for each
- for (c = 0; c < 3; c++)
- {
- maxVal = (1 << src.getNomRangeBits(cps[c])) - 1;
- shift = levShift[c];
-
- // Initialize db
- db.ulx = ulx;
- db.uly = uly + i;
- db.w = w;
- db.h = 1;
-
- // Request the data and make sure it is not progressive
- do
- {
- db = (DataBlkInt)src.getInternCompData(db, cps[c]);
- }
- while (db.progressive);
- // Get the fracbits value
- fracbits = fb[c];
- // Write all bytes in the line
- if (fracbits == 0)
- {
- for (k = db.offset + w - 1, j = 3 * w - 1 + c - 2; j >= 0; k--)
- {
- tmp = db.data_array[k] + shift;
- buf[j] = (byte)((tmp < 0) ? 0 : ((tmp > maxVal) ? maxVal : tmp));
- j -= 3;
- }
- }
- else
- {
- for (k = db.offset + w - 1, j = 3 * w - 1 + c - 2; j >= 0; k--)
- {
- tmp = (SupportClass.URShift(db.data_array[k], fracbits)) + shift;
- buf[j] = (byte)((tmp < 0) ? 0 : ((tmp > maxVal) ? maxVal : tmp));
- j -= 3;
- }
- }
- }
- // Write buffer into file
- out_Renamed.Seek(offset + 3 * (this.w * (uly + tOffy + i) + ulx + tOffx), System.IO.SeekOrigin.Begin);
- out_Renamed.Write(buf, 0, 3 * w);
- }
- }
-
- /// Writes the source's current tile to the output. The requests of data
- /// issued to the source BlkImgDataSrc object are done by strips, in order
- /// to reduce memory usage.
- ///
- /// If the data returned from the BlkImgDataSrc source is progressive,
- /// then it is requested over and over until it is not progressive any
- /// more.
- ///
- ///
- /// If an I/O error occurs.
- ///
- ///
- public override void write()
- {
- int i;
- int tIdx = src.TileIdx;
- int tw = src.getTileCompWidth(tIdx, 0); // Tile width
- int th = src.getTileCompHeight(tIdx, 0); // Tile height
- // Write in strips
- for (i = 0; i < th; i += DEF_STRIP_HEIGHT)
- {
- write(0, i, tw, ((th - i) < DEF_STRIP_HEIGHT) ? th - i : DEF_STRIP_HEIGHT);
- }
- }
-
- /// Writes the header info of the PPM file :
- ///
- /// P6
- ///
- /// width height
- ///
- /// 255
- ///
- ///
- /// If there is an I/O Error
- ///
- ///
- private void writeHeaderInfo()
- {
- byte[] byteVals;
- int i;
- System.String val;
-
- // write 'P6' to file
- out_Renamed.Seek(0, System.IO.SeekOrigin.Begin);
- out_Renamed.WriteByte((System.Byte)80);
- out_Renamed.WriteByte((System.Byte)54);
- out_Renamed.WriteByte((System.Byte)10); // new line
- offset = 3;
- // Write width in ASCII
- val = System.Convert.ToString(w);
- byteVals = System.Text.ASCIIEncoding.ASCII.GetBytes(val);
- for (i = 0; i < byteVals.Length; i++)
- {
- out_Renamed.WriteByte((byte)byteVals[i]);
- offset++;
- }
- out_Renamed.WriteByte((System.Byte)32); // blank
- offset++;
- // Write height in ASCII
- val = System.Convert.ToString(h);
- byteVals = System.Text.ASCIIEncoding.ASCII.GetBytes(val);
- for (i = 0; i < byteVals.Length; i++)
- {
- out_Renamed.WriteByte((byte)byteVals[i]);
- offset++;
- }
-
- out_Renamed.WriteByte((System.Byte)10); // newline
- out_Renamed.WriteByte((System.Byte)50); // '2'
- out_Renamed.WriteByte((System.Byte)53); // '5'
- out_Renamed.WriteByte((System.Byte)53); // '5'
- out_Renamed.WriteByte((System.Byte)10); // newline
- offset += 5;
- }
-
-
- /// Returns a string of information about the object, more than 1 line
- /// long. The information string includes information from the underlying
- /// RandomAccessFile (its toString() method is called in turn).
- ///
- ///
- /// A string of information about the object.
- ///
- ///
- public override System.String ToString()
- {
- //UPGRADE_TODO: The equivalent in .NET for method 'java.lang.Object.toString' may return a different value. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1043'"
- return "ImgWriterPPM: WxH = " + w + "x" + h + ", Components = " + cps[0] + "," + cps[1] + "," + cps[2] + "\nUnderlying RandomAccessFile:\n" + out_Renamed.ToString();
- }
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/io/BEBufferedRandomAccessFile.cs b/CSJ2K/j2k/io/BEBufferedRandomAccessFile.cs
deleted file mode 100644
index 9dbda311..00000000
--- a/CSJ2K/j2k/io/BEBufferedRandomAccessFile.cs
+++ /dev/null
@@ -1,440 +0,0 @@
-/*
-* CVS Identifier:
-*
-* $Id: BEBufferedRandomAccessFile.java,v 1.18 2001/07/17 13:13:35 grosbois Exp $
-*
-* Interface: RandomAccessIO.java
-*
-* Description: Class for random access I/O (big-endian ordering).
-*
-*
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-* */
-using System;
-namespace CSJ2K.j2k.io
-{
-
- /// This class defines a Buffered Random Access File, where all I/O is
- /// considered to be big-endian. It extends the
- /// BufferedRandomAccessFile class.
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public class BEBufferedRandomAccessFile : BufferedRandomAccessFile, RandomAccessIO, EndianType
- {
-
- /// Constructor. Always needs a size for the buffer.
- ///
- ///
- /// The file associated with the buffer
- ///
- ///
- /// "r" for read, "rw" or "rw+" for read and write mode ("rw+"
- /// opens the file for update whereas "rw" removes it
- /// before. So the 2 modes are different only if the file
- /// already exists).
- ///
- ///
- /// The number of bytes to buffer
- ///
- ///
- /// If an I/O error ocurred.
- ///
- ///
- public BEBufferedRandomAccessFile(System.IO.FileInfo file, System.String mode, int bufferSize) : base(file, mode, bufferSize)
- {
- byte_Ordering = CSJ2K.j2k.io.EndianType_Fields.BIG_ENDIAN;
- }
-
- /// Constructor. Uses the default value for the byte-buffer size (512
- /// bytes).
- ///
- ///
- /// The file associated with the buffer
- ///
- ///
- /// "r" for read, "rw" or "rw+" for read and write mode ("rw+"
- /// opens the file for update whereas "rw" removes it
- /// before. So the 2 modes are different only if the file
- /// already exists).
- ///
- ///
- /// If an I/O error ocurred.
- ///
- ///
- public BEBufferedRandomAccessFile(System.IO.FileInfo file, System.String mode) : base(file, mode)
- {
- byte_Ordering = CSJ2K.j2k.io.EndianType_Fields.BIG_ENDIAN;
- }
-
- /// Constructor. Always needs a size for the buffer.
- ///
- ///
- /// The name of the file associated with the buffer
- ///
- ///
- /// "r" for read, "rw" or "rw+" for read and write mode ("rw+"
- /// opens the file for update whereas "rw" removes it
- /// before. So the 2 modes are different only if the file
- /// already exists).
- ///
- ///
- /// The number of bytes to buffer
- ///
- ///
- /// If an I/O error ocurred.
- ///
- ///
- public BEBufferedRandomAccessFile(System.String name, System.String mode, int bufferSize) : base(name, mode, bufferSize)
- {
- byte_Ordering = CSJ2K.j2k.io.EndianType_Fields.BIG_ENDIAN;
- }
-
- /// Constructor. Uses the default value for the byte-buffer size (512
- /// bytes).
- ///
- ///
- /// The name of the file associated with the buffer
- ///
- ///
- /// "r" for read, "rw" or "rw+" for read and write mode ("rw+"
- /// opens the file for update whereas "rw" removes it
- /// before. So the 2 modes are different only if the file
- /// already exists).
- ///
- ///
- /// If an I/O error ocurred.
- ///
- ///
- public BEBufferedRandomAccessFile(System.String name, System.String mode) : base(name, mode)
- {
- byte_Ordering = CSJ2K.j2k.io.EndianType_Fields.BIG_ENDIAN;
- }
-
- /// Writes the short value of v (i.e., 16 least significant bits)
- /// to the output. Prior to writing, the output should be realigned at the
- /// byte level.
- ///
- /// Signed or unsigned data can be written. To write a signed value just
- /// pass the short value as an argument. To write unsigned data
- /// pass the int value as an argument (it will be automatically
- /// casted, and only the 16 least significant bits will be written).
- ///
- ///
- /// The value to write to the output
- ///
- ///
- /// If an I/O error ocurred.
- ///
- ///
- public override void writeShort(int v)
- {
- write(SupportClass.URShift(v, 8));
- write(v);
- }
-
- /// Writes the int value of v (i.e., the 32 bits) to the
- /// output. Prior to writing, the output should be realigned at the byte
- /// level.
- ///
- ///
- /// The value to write to the output
- ///
- ///
- /// If an I/O error ocurred.
- ///
- ///
- public override void writeInt(int v)
- {
- write(SupportClass.URShift(v, 24));
- write(SupportClass.URShift(v, 16));
- write(SupportClass.URShift(v, 8));
- write(v);
- }
-
- /// Writes the long value of v (i.e., the 64 bits) to the
- /// output. Prior to writing, the output should be realigned at the byte
- /// level.
- ///
- ///
- /// The value to write to the output
- ///
- ///
- /// If an I/O error ocurred.
- ///
- ///
- public override void writeLong(long v)
- {
- write((int)(SupportClass.URShift(v, 56)));
- write((int)(SupportClass.URShift(v, 48)));
- write((int)(SupportClass.URShift(v, 40)));
- write((int)(SupportClass.URShift(v, 32)));
- write((int)(SupportClass.URShift(v, 24)));
- write((int)(SupportClass.URShift(v, 16)));
- write((int)(SupportClass.URShift(v, 8)));
- write((int)v);
- }
-
- /// Writes the IEEE float value v (i.e., 32 bits) to the
- /// output. Prior to writing, the output should be realigned at the byte
- /// level.
- ///
- ///
- /// The value to write to the output
- ///
- ///
- /// If an I/O error ocurred.
- ///
- ///
- public override void writeFloat(float v)
- {
- // CONVERSION PROBLEM? OPTIMIZE!!!
- //byte[] floatbytes = BitConverter.GetBytes(v);
- //for (int i = floatbytes.Length-1; i >= 0 ; i--) write(floatbytes[i]);
-
- //UPGRADE_ISSUE: Method 'java.lang.Float.floatToIntBits' was not converted. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1000_javalangFloatfloatToIntBits_float'"
- //int intV = Float.floatToIntBits(v);
- int intV = BitConverter.ToInt32(BitConverter.GetBytes(v), 0);
- write(SupportClass.URShift(intV, 24));
- write(SupportClass.URShift(intV, 16));
- write(SupportClass.URShift(intV, 8));
- write(intV);
- }
-
- /// Writes the IEEE double value v (i.e., 64 bits) to the
- /// output. Prior to writing, the output should be realigned at the byte
- /// level.
- ///
- ///
- /// The value to write to the output
- ///
- ///
- /// If an I/O error ocurred.
- ///
- ///
- public override void writeDouble(double v)
- {
- //byte[] doublebytes = BitConverter.GetBytes(v);
- //for (int i = doublebytes.Length-1; i >= 0 ; i--) write(doublebytes[i]);
-
- //UPGRADE_ISSUE: Method 'java.lang.Double.doubleToLongBits' was not converted. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1000_javalangDoubledoubleToLongBits_double'"
- //long longV = Double.doubleToLongBits(v);
- long longV = BitConverter.ToInt64(BitConverter.GetBytes(v), 0);
- write((int)(SupportClass.URShift(longV, 56)));
- write((int)(SupportClass.URShift(longV, 48)));
- write((int)(SupportClass.URShift(longV, 40)));
- write((int)(SupportClass.URShift(longV, 32)));
- write((int)(SupportClass.URShift(longV, 24)));
- write((int)(SupportClass.URShift(longV, 16)));
- write((int)(SupportClass.URShift(longV, 8)));
- write((int)(longV));
-
- }
-
- /// Reads a signed short (i.e. 16 bit) from the input. Prior to reading,
- /// the input should be realigned at the byte level.
- ///
- ///
- /// The next byte-aligned signed short (16 bit) from the input.
- ///
- ///
- /// If the end-of file was reached before
- /// getting all the necessary data.
- ///
- ///
- /// If an I/O error ocurred.
- ///
- ///
- public override short readShort()
- {
- return (short)((read() << 8) | (read()));
- }
-
- /// Reads an unsigned short (i.e., 16 bit) from the input. It is returned
- /// as an int since Java does not have an unsigned short
- /// type. Prior to reading, the input should be realigned at the byte
- /// level.
- ///
- ///
- /// The next byte-aligned unsigned short (16 bit) from the input,
- /// as an int.
- ///
- ///
- /// If the end-of file was reached before
- /// getting all the necessary data.
- ///
- ///
- /// If an I/O error ocurred.
- ///
- ///
- public override int readUnsignedShort()
- {
- return ((read() << 8) | read());
- }
-
- /// Reads a signed int (i.e., 32 bit) from the input. Prior to reading, the
- /// input should be realigned at the byte level.
- ///
- ///
- /// The next byte-aligned signed int (32 bit) from the input.
- ///
- ///
- /// If the end-of file was reached before
- /// getting all the necessary data.
- ///
- ///
- /// If an I/O error ocurred.
- ///
- ///
- public override int readInt()
- {
- return ((read() << 24) | (read() << 16) | (read() << 8) | read());
- }
-
- /// Reads an unsigned int (i.e., 32 bit) from the input. It is returned as
- /// a long since Java does not have an unsigned short type. Prior
- /// to reading, the input should be realigned at the byte level.
- ///
- ///
- /// The next byte-aligned unsigned int (32 bit) from the input, as
- /// a long.
- ///
- ///
- /// If the end-of file was reached before
- /// getting all the necessary data.
- ///
- ///
- /// If an I/O error ocurred.
- ///
- ///
- public override long readUnsignedInt()
- {
- return (long)((read() << 24) | (read() << 16) | (read() << 8) | read());
- }
-
- /// Reads a signed long (i.e., 64 bit) from the input. Prior to reading,
- /// the input should be realigned at the byte level.
- ///
- ///
- /// The next byte-aligned signed long (64 bit) from the input.
- ///
- ///
- /// If the end-of file was reached before
- /// getting all the necessary data.
- ///
- ///
- /// If an I/O error ocurred.
- ///
- ///
- public override long readLong()
- {
- //byte[] longbytes = new byte[8];
- //for (int i = longbytes.Length-1; i >= 0; i--) longbytes[i] = read();
- //return BitConverter.ToInt64(longbytes, 0);
- return ((long)(((ulong)read() << 56) | ((ulong)read() << 48) | ((ulong)read() << 40) | ((ulong)read() << 32) | ((ulong)read() << 24) | ((ulong)read() << 16) | ((ulong)read() << 8) | ((ulong)read())));
- }
-
- /// Reads an IEEE single precision (i.e., 32 bit) floating-point number
- /// from the input. Prior to reading, the input should be realigned at the
- /// byte level.
- ///
- ///
- /// The next byte-aligned IEEE float (32 bit) from the input.
- ///
- ///
- /// If the end-of file was reached before
- /// getting all the necessary data.
- ///
- ///
- /// If an I/O error ocurred.
- ///
- ///
- public override float readFloat()
- {
- // CONVERSION PROBLEM? OPTIMIZE!!!
- //byte[] floatbytes = new byte[4];
- //for (int i = floatbytes.Length-1; i >= 0 ; i--) floatbytes[i] = (byte)read();
- //return BitConverter.ToSingle(floatbytes, 0);
-
- //UPGRADE_ISSUE: Method 'java.lang.Float.intBitsToFloat' was not converted. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1000_javalangFloatintBitsToFloat_int'"
- //return Float.intBitsToFloat((read() << 24) | (read() << 16) | (read() << 8) | (read()));
- return BitConverter.ToSingle(BitConverter.GetBytes((read() << 24) | (read() << 16) | (read() << 8) | (read())), 0);
-
- }
-
- /// Reads an IEEE double precision (i.e., 64 bit) floating-point number
- /// from the input. Prior to reading, the input should be realigned at the
- /// byte level.
- ///
- ///
- /// The next byte-aligned IEEE double (64 bit) from the input.
- ///
- ///
- /// If the end-of file was reached before
- /// getting all the necessary data.
- ///
- ///
- /// If an I/O error ocurred.
- ///
- ///
- public override double readDouble()
- {
- // CONVERSION PROBLEM? OPTIMIZE!!!
- //byte[] doublebytes = new byte[8];
- //for (int i = doublebytes.Length-1; i >=0 ; i--) doublebytes[i] = (byte)read();
- //return BitConverter.ToDouble(doublebytes, 0);
-
- //UPGRADE_ISSUE: Method 'java.lang.Double.longBitsToDouble' was not converted. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1000_javalangDoublelongBitsToDouble_long'"
- //return Double.longBitsToDouble(((long) read() << 56) | ((long) read() << 48) | ((long) read() << 40) | ((long) read() << 32) | ((long) read() << 24) | ((long) read() << 16) | ((long) read() << 8) | ((long) read()));
-
- return BitConverter.ToDouble(BitConverter.GetBytes(((long)read() << 56) | ((long)read() << 48) | ((long)read() << 40) | ((long)read() << 32) | ((long)read() << 24) | ((long)read() << 16) | ((long)read() << 8) | ((long)read())), 0);
-
- }
-
- /// Returns a string of information about the file and the endianess
- ///
- ///
- public override System.String ToString()
- {
- return base.ToString() + "\nBig-Endian ordering";
- }
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/io/BinaryDataInput.cs b/CSJ2K/j2k/io/BinaryDataInput.cs
deleted file mode 100644
index d4e24035..00000000
--- a/CSJ2K/j2k/io/BinaryDataInput.cs
+++ /dev/null
@@ -1,252 +0,0 @@
-/*
-* CVS Identifier:
-*
-* $Id: BinaryDataInput.java,v 1.12 2001/07/23 09:27:26 grosbois Exp $
-*
-* Interface: BinaryDataInput
-*
-* Description: Stream like interface for binary
-* input from a stream or file.
-*
-*
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-* */
-namespace CSJ2K.j2k.io
-{
-
- /// This interface defines the input of binary data from streams and/or files.
- ///
- /// Byte level input (i.e., for byte, int, long, float, etc.) should always
- /// be byte aligned. For example, a request to read an int should
- /// always realign the input at the byte level.
- ///
- /// The implementation of this interface should clearly define if multi-byte
- /// input data is read in little- or big-endian byte ordering (least
- /// significant byte first or most significant byte first, respectively).
- ///
- ///
- ///
- ///
- ///
- public interface BinaryDataInput
- {
- /// Returns the endianess (i.e., byte ordering) of the implementing
- /// class. Note that an implementing class may implement only one type of
- /// endianness or both, which would be decided at creatiuon time.
- ///
- ///
- /// Either EndianType.BIG_ENDIAN or
- /// EndianType.LITTLE_ENDIAN
- ///
- ///
- ///
- ///
- ///
- int ByteOrdering
- {
- get;
-
- }
-
- /// Should read a signed byte (i.e., 8 bit) from the input. reading, the
- /// input should be realigned at the byte level.
- ///
- ///
- /// The next byte-aligned signed byte (8 bit) from the input.
- ///
- ///
- /// If the end-of file was reached before getting
- /// all the necessary data.
- ///
- ///
- /// If an I/O error ocurred.
- ///
- ///
- byte readByte();
-
- /// Should read an unsigned byte (i.e., 8 bit) from the input. It is
- /// returned as an int since Java does not have an unsigned byte
- /// type. Prior to reading, the input should be realigned at the byte
- /// level.
- ///
- ///
- /// The next byte-aligned unsigned byte (8 bit) from the input, as
- /// an int.
- ///
- ///
- /// If the end-of file was reached before getting
- /// all the necessary data.
- ///
- ///
- /// If an I/O error ocurred.
- ///
- ///
- byte readUnsignedByte();
-
- /// Should read a signed short (i.e., 16 bit) from the input. Prior to
- /// reading, the input should be realigned at the byte level.
- ///
- ///
- /// The next byte-aligned signed short (16 bit) from the input.
- ///
- ///
- /// If the end-of file was reached before getting
- /// all the necessary data.
- ///
- ///
- /// If an I/O error ocurred.
- ///
- ///
- short readShort();
-
- /// Should read an unsigned short (i.e., 16 bit) from the input. It is
- /// returned as an int since Java does not have an unsigned short
- /// type. Prior to reading, the input should be realigned at the byte
- /// level.
- ///
- ///
- /// The next byte-aligned unsigned short (16 bit) from the input,
- /// as an int.
- ///
- ///
- /// If the end-of file was reached before getting
- /// all the necessary data.
- ///
- ///
- /// If an I/O error ocurred.
- ///
- ///
- int readUnsignedShort();
-
- /// Should read a signed int (i.e., 32 bit) from the input. Prior to
- /// reading, the input should be realigned at the byte level.
- ///
- ///
- /// The next byte-aligned signed int (32 bit) from the input.
- ///
- ///
- /// If the end-of file was reached before getting
- /// all the necessary data.
- ///
- ///
- /// If an I/O error ocurred.
- ///
- ///
- int readInt();
-
- /// Should read an unsigned int (i.e., 32 bit) from the input. It is
- /// returned as a long since Java does not have an unsigned short
- /// type. Prior to reading, the input should be realigned at the byte
- /// level.
- ///
- ///
- /// The next byte-aligned unsigned int (32 bit) from the input, as
- /// a long.
- ///
- ///
- /// If the end-of file was reached before getting
- /// all the necessary data.
- ///
- ///
- /// If an I/O error ocurred.
- ///
- ///
- long readUnsignedInt();
-
- /// Should read a signed long (i.e., 64 bit) from the input. Prior to
- /// reading, the input should be realigned at the byte level.
- ///
- ///
- /// The next byte-aligned signed long (64 bit) from the input.
- ///
- ///
- /// If the end-of file was reached before getting
- /// all the necessary data.
- ///
- ///
- /// If an I/O error ocurred.
- ///
- ///
- long readLong();
-
- /// Should read an IEEE single precision (i.e., 32 bit) floating-point
- /// number from the input. Prior to reading, the input should be realigned
- /// at the byte level.
- ///
- ///
- /// The next byte-aligned IEEE float (32 bit) from the input.
- ///
- ///
- /// If the end-of file was reached before getting
- /// all the necessary data.
- ///
- ///
- /// If an I/O error ocurred.
- ///
- ///
- float readFloat();
-
- /// Should read an IEEE double precision (i.e., 64 bit) floating-point
- /// number from the input. Prior to reading, the input should be realigned
- /// at the byte level.
- ///
- ///
- /// The next byte-aligned IEEE double (64 bit) from the input.
- ///
- ///
- /// If the end-of file was reached before getting
- /// all the necessary data.
- ///
- ///
- /// If an I/O error ocurred.
- ///
- ///
- double readDouble();
-
- /// Skips n bytes from the input. Prior to skipping, the input
- /// should be realigned at the byte level.
- ///
- ///
- /// The number of bytes to skip
- ///
- ///
- /// If the end-of file was reached before all the
- /// bytes could be skipped.
- ///
- ///
- /// If an I/O error ocurred.
- ///
- ///
- int skipBytes(int n);
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/io/BinaryDataOutput.cs b/CSJ2K/j2k/io/BinaryDataOutput.cs
deleted file mode 100644
index dd5b6273..00000000
--- a/CSJ2K/j2k/io/BinaryDataOutput.cs
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
-* CVS Identifier:
-*
-* $Id: BinaryDataOutput.java,v 1.11 2000/09/05 09:24:33 grosbois Exp $
-*
-* Interface: BinaryDataOutput
-*
-* Description: Stream like interface for bit as well as byte
-* level output to a stream or file.
-*
-*
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-*
-*
-*
-*/
-namespace CSJ2K.j2k.io
-{
-
- /// This interface defines the output of binary data to streams and/or files.
- ///
- /// Byte level output (i.e., for byte, int, long, float, etc.) should
- /// always be byte aligned. For example, a request to write an
- /// int should always realign the output at the byte level.
- ///
- ///
The implementation of this interface should clearly define if
- /// multi-byte output data is written in little- or big-endian byte
- /// ordering (least significant byte first or most significant byte
- /// first, respectively).
- ///
- ///
- ///
- ///
- ///
- public interface BinaryDataOutput
- {
- /// Returns the endianness (i.e., byte ordering) of the implementing
- /// class. Note that an implementing class may implement only one
- /// type of endianness or both, which would be decided at creatiuon
- /// time.
- ///
- ///
- /// Either EndianType.BIG_ENDIAN or
- /// EndianType.LITTLE_ENDIAN
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- int ByteOrdering
- {
- get;
-
- }
-
- /// Should write the byte value of v (i.e., 8 least
- /// significant bits) to the output. Prior to writing, the output
- /// should be realigned at the byte level.
- ///
- /// Signed or unsigned data can be written. To write a signed
- /// value just pass the byte value as an argument. To
- /// write unsigned data pass the int value as an argument
- /// (it will be automatically casted, and only the 8 least
- /// significant bits will be written).
- ///
- ///
- /// The value to write to the output
- ///
- ///
- /// If an I/O error ocurred.
- ///
- ///
- ///
- ///
- void writeByte(int v);
-
- /// Should write the short value of v (i.e., 16 least
- /// significant bits) to the output. Prior to writing, the output
- /// should be realigned at the byte level.
- ///
- /// Signed or unsigned data can be written. To write a signed
- /// value just pass the short value as an argument. To
- /// write unsigned data pass the int value as an argument
- /// (it will be automatically casted, and only the 16 least
- /// significant bits will be written).
- ///
- ///
- /// The value to write to the output
- ///
- ///
- /// If an I/O error ocurred.
- ///
- ///
- ///
- ///
- void writeShort(int v);
-
- /// Should write the int value of v (i.e., the 32 bits) to
- /// the output. Prior to writing, the output should be realigned at
- /// the byte level.
- ///
- ///
- /// The value to write to the output
- ///
- ///
- /// If an I/O error ocurred.
- ///
- ///
- ///
- ///
- void writeInt(int v);
-
- /// Should write the long value of v (i.e., the 64 bits)
- /// to the output. Prior to writing, the output should be realigned
- /// at the byte level.
- ///
- ///
- /// The value to write to the output
- ///
- ///
- /// If an I/O error ocurred.
- ///
- ///
- ///
- ///
- void writeLong(long v);
-
- /// Should write the IEEE float value v (i.e., 32 bits) to
- /// the output. Prior to writing, the output should be realigned at
- /// the byte level.
- ///
- ///
- /// The value to write to the output
- ///
- ///
- /// If an I/O error ocurred.
- ///
- ///
- ///
- ///
- void writeFloat(float v);
-
- /// Should write the IEEE double value v (i.e., 64 bits)
- /// to the output. Prior to writing, the output should be realigned
- /// at the byte level.
- ///
- ///
- /// The value to write to the output
- ///
- ///
- /// If an I/O error ocurred.
- ///
- ///
- ///
- ///
- void writeDouble(double v);
-
- /// Any data that has been buffered must be written, and the stream should
- /// be realigned at the byte level.
- ///
- ///
- /// If an I/O error ocurred.
- ///
- ///
- ///
- ///
- void flush();
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/io/BufferedRandomAccessFile.cs b/CSJ2K/j2k/io/BufferedRandomAccessFile.cs
deleted file mode 100644
index 2a5cf0c3..00000000
--- a/CSJ2K/j2k/io/BufferedRandomAccessFile.cs
+++ /dev/null
@@ -1,742 +0,0 @@
-/*
-* CVS Identifier:
-*
-* $Id: BufferedRandomAccessFile.java,v 1.21 2001/04/15 14:34:29 grosbois Exp $
-*
-* Interface: RandomAccessIO.java
-*
-* Description: Abstract class for buffered random access I/O.
-*
-*
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-* */
-using System;
-namespace CSJ2K.j2k.io
-{
-
- /// This class defines a Buffered Random Access File. It implements the
- /// BinaryDataInput and BinaryDataOutput interfaces so that
- /// binary data input/output can be performed. This class is abstract since no
- /// assumption is done about the byte ordering type (little Endian, big
- /// Endian). So subclasses will have to implement methods like
- /// readShort(), writeShort(), readFloat(), ...
- ///
- /// BufferedRandomAccessFile (BRAF for short) is a
- /// RandomAccessFile containing an extra buffer. When the BRAF is
- /// accessed, it checks if the requested part of the file is in the buffer or
- /// not. If that is the case, the read/write is done on the buffer. If not, the
- /// file is uppdated to reflect the current status of the buffer and the file
- /// is then accessed for a new buffer containing the requested byte/bit.
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public abstract class BufferedRandomAccessFile : RandomAccessIO, EndianType
- {
- /// Returns the current offset in the file
- ///
- ///
- virtual public int Pos
- {
- get
- {
- return (offset + position);
- }
-
- }
- /// Returns the endianess (i.e., byte ordering) of the implementing
- /// class. Note that an implementing class may implement only one
- /// type of endianness or both, which would be decided at creation
- /// time.
- ///
- ///
- /// Either EndianType.BIG_ENDIAN or
- /// EndianType.LITTLE_ENDIAN
- ///
- ///
- ///
- ///
- ///
- virtual public int ByteOrdering
- {
- get
- {
- return byte_Ordering;
- }
-
- }
-
- /// The name of the current file
- private System.String fileName;
-
- /// Whether the opened file is read only or not (defined by the constructor
- /// arguments)
- ///
- ///
- private bool isReadOnly = true;
-
- /// The RandomAccessFile associated with the buffer
- ///
- ///
- //UPGRADE_TODO: Class 'java.io.RandomAccessFile' was converted to 'System.IO.FileStream' which has a different behavior. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1073_javaioRandomAccessFile'"
- private System.IO.FileStream theFile;
-
- /// Buffer of bytes containing the part of the file that is currently being
- /// accessed
- ///
- ///
- protected internal byte[] byteBuffer;
-
- /// Boolean keeping track of whether the byte buffer has been changed since
- /// it was read.
- ///
- ///
- protected internal bool byteBufferChanged;
-
- /// The current offset of the buffer (which will differ from the offset of
- /// the file)
- ///
- ///
- protected internal int offset;
-
- /// The current position in the byte-buffer
- ///
- ///
- protected internal int position;
-
- /// The maximum number of bytes that can be read from the buffer
- ///
- ///
- protected internal int maxByte;
-
- /// Whether the end of the file is in the current buffer or not
- ///
- ///
- protected internal bool isEOFInBuffer;
-
- /* The endianess of the class */
- protected internal int byte_Ordering;
-
- /// Constructor. Always needs a size for the buffer.
- ///
- ///
- /// The file associated with the buffer
- ///
- ///
- /// "r" for read, "rw" or "rw+" for read and write mode ("rw+"
- /// opens the file for update whereas "rw" removes it
- /// before. So the 2 modes are different only if the file
- /// already exists).
- ///
- ///
- /// The number of bytes to buffer
- ///
- ///
- /// If an I/O error ocurred.
- ///
- ///
- protected internal BufferedRandomAccessFile(System.IO.FileInfo file, System.String mode, int bufferSize)
- {
-
- fileName = file.Name;
- if (mode.Equals("rw") || mode.Equals("rw+"))
- {
- // mode read / write
- isReadOnly = false;
- if (mode.Equals("rw"))
- {
- // mode read / (over)write
- bool tmpBool;
- if (System.IO.File.Exists(file.FullName))
- tmpBool = true;
- else
- tmpBool = System.IO.Directory.Exists(file.FullName);
- if (tmpBool)
- // Output file already exists
- {
- bool tmpBool2;
- if (System.IO.File.Exists(file.FullName))
- {
- System.IO.File.Delete(file.FullName);
- tmpBool2 = true;
- }
- else if (System.IO.Directory.Exists(file.FullName))
- {
- System.IO.Directory.Delete(file.FullName);
- tmpBool2 = true;
- }
- else
- tmpBool2 = false;
- bool generatedAux = tmpBool2;
- }
- }
- mode = "rw";
- }
- theFile = SupportClass.RandomAccessFileSupport.CreateRandomAccessFile(file, mode);
- byteBuffer = new byte[bufferSize];
- readNewBuffer(0);
- }
-
- /// Constructor. Uses the default value for the byte-buffer
- /// size (512 bytes).
- ///
- ///
- /// The file associated with the buffer
- ///
- ///
- /// "r" for read, "rw" or "rw+" for read and write mode
- /// ("rw+" opens the file for update whereas "rw" removes
- /// it before. So the 2 modes are different only if the
- /// file already exists).
- ///
- ///
- /// If an I/O error ocurred.
- ///
- ///
- protected internal BufferedRandomAccessFile(System.IO.FileInfo file, System.String mode) : this(file, mode, 512)
- {
- }
-
- /// Constructor. Always needs a size for the buffer.
- ///
- ///
- /// The name of the file associated with the buffer
- ///
- ///
- /// "r" for read, "rw" or "rw+" for read and write mode
- /// ("rw+" opens the file for update whereas "rw" removes
- /// it before. So the 2 modes are different only if the
- /// file already exists).
- ///
- ///
- /// The number of bytes to buffer
- ///
- ///
- /// If an I/O error ocurred.
- ///
- ///
- protected internal BufferedRandomAccessFile(System.String name, System.String mode, int bufferSize) : this(new System.IO.FileInfo(name), mode, bufferSize)
- {
- }
-
- /// Constructor. Uses the default value for the byte-buffer
- /// size (512 bytes).
- ///
- ///
- /// The name of the file associated with the buffer
- ///
- ///
- /// "r" for read, "rw" or "rw+" for read and write mode
- /// ("rw+" opens the file for update whereas "rw" removes
- /// it before. So the 2 modes are different only if the
- /// file already exists).
- ///
- ///
- /// If an I/O error ocurred.
- ///
- ///
- protected internal BufferedRandomAccessFile(System.String name, System.String mode) : this(name, mode, 512)
- {
- }
-
- /// Reads a new buffer from the file. If there has been any
- /// changes made since the buffer was read, the buffer is
- /// first written to the file.
- ///
- ///
- /// The offset where to move to.
- ///
- ///
- /// If an I/O error ocurred.
- ///
- ///
- protected internal void readNewBuffer(int off)
- {
-
- /* If the buffer have changed. We need to write it to
- * the file before reading a new buffer.
- */
- if (byteBufferChanged)
- {
- flush();
- }
- // Don't allow to seek beyond end of file if reading only
- if (isReadOnly && off >= theFile.Length)
- {
- throw new System.IO.EndOfStreamException();
- }
- // Set new offset
- offset = off;
-
- theFile.Seek(offset, System.IO.SeekOrigin.Begin);
-
- maxByte = theFile.Read(byteBuffer, 0, byteBuffer.Length);
- position = 0;
-
- if (maxByte < byteBuffer.Length)
- {
- // Not enough data in input file.
- isEOFInBuffer = true;
- if (maxByte == -1)
- {
- maxByte++;
- }
- }
- else
- {
- isEOFInBuffer = false;
- }
- }
-
- /// Closes the buffered random access file
- ///
- ///
- /// If an I/O error ocurred.
- ///
- ///
- public virtual void close()
- {
- /* If the buffer has been changed, it need to be saved before
- * closing
- */
- flush();
- byteBuffer = null; // Release the byte-buffer reference
- theFile.Close();
- }
-
- /// Returns the current length of the stream, in bytes, taking into
- /// account any buffering.
- ///
- ///
- /// The length of the stream, in bytes.
- ///
- ///
- /// If an I/O error ocurred.
- ///
- ///
- public virtual int length()
- {
- int len;
-
- len = (int)theFile.Length;
-
- // If the position in the buffer is not past the end of the file,
- // the length of theFile is the length of the stream
- if ((offset + maxByte) <= len)
- {
- return (len);
- }
- else
- {
- // If not, the file is extended due to the buffering
- return (offset + maxByte);
- }
- }
-
- /// Moves the current position to the given offset at which the
- /// next read or write occurs. The offset is measured from the
- /// beginning of the stream.
- ///
- ///
- /// The offset where to move to.
- ///
- ///
- /// If in read-only and seeking beyond EOF.
- ///
- ///
- /// If an I/O error ocurred.
- ///
- ///
- public virtual void seek(int off)
- {
- /* If the new offset is within the buffer, only the pos value needs
- * to be modified. Else, the buffer must be moved. */
- if ((off >= offset) && (off < (offset + byteBuffer.Length)))
- {
- if (isReadOnly && isEOFInBuffer && off > offset + maxByte)
- {
- // We are seeking beyond EOF in read-only mode!
- throw new System.IO.EndOfStreamException();
- }
- position = off - offset;
- }
- else
- {
- readNewBuffer(off);
- }
- }
-
- /// Reads an unsigned byte of data from the stream. Prior to reading, the
- /// stream is realigned at the byte level.
- ///
- ///
- /// The byte read.
- ///
- ///
- /// If an I/O error ocurred.
- ///
- ///
- /// If the end of file was reached
- ///
- ///
- public byte readByte() { return read(); }
- public byte readUnsignedByte() { return read(); }
- public byte read()
- {
- if (position < maxByte)
- {
- // The byte can be read from the buffer
- // In Java, the bytes are always signed.
- return (byteBuffer[position++]);
- }
- else if (isEOFInBuffer)
- {
- // EOF is reached
- position = maxByte + 1; // Set position to EOF
- throw new System.IO.EndOfStreamException();
- }
- else
- {
- // End of the buffer is reached
- readNewBuffer(offset + position);
- return read();
- }
- }
-
- /// Reads up to len bytes of data from this file into an array of
- /// bytes. This method reads repeatedly from the stream until all the bytes
- /// are read. This method blocks until all the bytes are read, the end of
- /// the stream is detected, or an exception is thrown.
- ///
- ///
- /// The buffer into which the data is to be read. It must be long
- /// enough.
- ///
- ///
- /// The index in 'b' where to place the first byte read.
- ///
- ///
- /// The number of bytes to read.
- ///
- ///
- /// If the end-of file was reached before
- /// getting all the necessary data.
- ///
- ///
- /// If an I/O error ocurred.
- ///
- ///
- public void readFully(byte[] b, int off, int len)
- {
- int clen; // current length to read
- while (len > 0)
- {
- // There still is some data to read
- if (position < maxByte)
- {
- // We can read some data from buffer
- clen = maxByte - position;
- if (clen > len)
- clen = len;
- Array.Copy(byteBuffer, position, b, off, clen);
- position += clen;
- off += clen;
- len -= clen;
- }
- else if (isEOFInBuffer)
- {
- position = maxByte + 1; // Set position to EOF
- throw new System.IO.EndOfStreamException();
- }
- else
- {
- // Buffer empty => get more data
- readNewBuffer(offset + position);
- }
- }
- }
-
- /// Writes a byte to the stream. Prior to writing, the stream is
- /// realigned at the byte level.
- ///
- ///
- /// The byte to write. The lower 8 bits of b are
- /// written.
- ///
- ///
- /// If an I/O error ocurred.
- ///
- ///
- public void write(int b)
- {
- // As long as pos is less than the length of the buffer we can write
- // to the buffer. If the position is after the buffer a new buffer is
- // needed
- if (position < byteBuffer.Length)
- {
- if (isReadOnly)
- throw new System.IO.IOException("File is read only");
- byteBuffer[position] = (byte)b;
- if (position >= maxByte)
- {
- maxByte = position + 1;
- }
- position++;
- byteBufferChanged = true;
- }
- else
- {
- readNewBuffer(offset + position);
- write(b);
- }
- }
-
- /// Writes a byte to the stream. Prior to writing, the stream is
- /// realigned at the byte level.
- ///
- ///
- /// The byte to write.
- ///
- ///
- /// If an I/O error ocurred.
- ///
- ///
- public void write(byte b)
- {
- // As long as pos is less than the length of the buffer we can write
- // to the buffer. If the position is after the buffer a new buffer is
- // needed
- if (position < byteBuffer.Length)
- {
- if (isReadOnly)
- throw new System.IO.IOException("File is read only");
- byteBuffer[position] = b;
- if (position >= maxByte)
- {
- maxByte = position + 1;
- }
- position++;
- byteBufferChanged = true;
- }
- else
- {
- readNewBuffer(offset + position);
- write(b);
- }
- }
-
- /// Writes aan array of bytes to the stream. Prior to writing, the stream is
- /// realigned at the byte level.
- ///
- ///
- /// The array of bytes to write.
- ///
- ///
- /// The first byte in b to write
- ///
- ///
- /// The number of bytes from b to write
- ///
- ///
- /// If an I/O error ocurred.
- ///
- ///
- public void write(byte[] b, int offset, int length)
- {
- int i, stop;
- stop = offset + length;
- if (stop > b.Length)
- throw new System.IndexOutOfRangeException("Index of bound " + b.Length);
- for (i = offset; i < stop; i++)
- {
- write(b[i]);
- }
- }
-
- /// Writes the byte value of v (i.e., 8 least
- /// significant bits) to the output. Prior to writing, the output
- /// should be realigned at the byte level.
- ///
- /// Signed or unsigned data can be written. To write a signed
- /// value just pass the byte value as an argument. To
- /// write unsigned data pass the int value as an argument
- /// (it will be automatically casted, and only the 8 least
- /// significant bits will be written).
- ///
- ///
- /// The value to write to the output
- ///
- ///
- /// If an I/O error ocurred.
- ///
- ///
- public void writeByte(int v)
- {
- write(v);
- }
-
- /// Any data that has been buffered must be written (including
- /// buffering at the bit level), and the stream should be realigned
- /// at the byte level.
- ///
- ///
- /// If an I/O error ocurred.
- ///
- ///
- public void flush()
- {
- if (byteBufferChanged)
- {
- theFile.Seek(offset, System.IO.SeekOrigin.Begin);
- theFile.Write(byteBuffer, 0, maxByte);
- byteBufferChanged = false;
- }
- }
- /*
- /// Reads a signed byte (i.e., 8 bit) from the input. Prior to
- /// reading, the input should be realigned at the byte level.
- ///
- ///
- /// The next byte-aligned signed byte (8 bit) from the
- /// input.
- ///
- ///
- /// If the end-of file was reached before
- /// getting all the necessary data.
- ///
- ///
- /// If an I/O error ocurred.
- ///
- ///
- public byte readByte()
- {
- if (pos < maxByte)
- {
- // The byte can be read from the buffer
- // In Java, the bytes are always signed.
- return byteBuffer[pos++];
- }
- else if (isEOFInBuffer)
- {
- // EOF is reached
- pos = maxByte + 1; // Set position to EOF
- throw new System.IO.EndOfStreamException();
- }
- else
- {
- // End of the buffer is reached
- readNewBuffer(offset + pos);
- return readByte();
- }
- }
-
- /// Reads an unsigned byte (i.e., 8 bit) from the input. It is
- /// returned as an int since Java does not have an
- /// unsigned byte type. Prior to reading, the input should be
- /// realigned at the byte level.
- ///
- ///
- /// The next byte-aligned unsigned byte (8 bit) from the
- /// input, as an int.
- ///
- ///
- /// If the end-of file was reached before
- /// getting all the necessary data.
- ///
- ///
- /// If an I/O error ocurred.
- ///
- ///
- public int readUnsignedByte()
- {
- return read();
- }
- */
- /// Skips n bytes from the input. Prior to skipping, the
- /// input should be realigned at the byte level.
- ///
- ///
- /// The number of bytes to skip
- ///
- ///
- /// If the end-of file was reached before
- /// all the bytes could be skipped.
- ///
- ///
- /// If an I/O error ocurred.
- ///
- ///
- public virtual int skipBytes(int n)
- {
- if (n < 0)
- throw new System.ArgumentException("Can not skip negative number " + "of bytes");
- if (n <= (maxByte - position))
- {
- position += n;
- return n;
- }
- else
- {
- seek(offset + position + n);
- return n;
- }
- }
-
- /// Returns a string of information about the file
- ///
- ///
- public override System.String ToString()
- {
- return "BufferedRandomAccessFile: " + fileName + " (" + ((isReadOnly) ? "read only" : "read/write") + ")";
- }
- public abstract int readUnsignedShort();
- public abstract void writeLong(long param1);
- public abstract void writeShort(int param1);
- public abstract float readFloat();
- public abstract short readShort();
- public abstract double readDouble();
- public abstract int readInt();
- public abstract long readLong();
- public abstract long readUnsignedInt();
- public abstract void writeDouble(double param1);
- public abstract void writeFloat(float param1);
- public abstract void writeInt(int param1);
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/io/EndianType.cs b/CSJ2K/j2k/io/EndianType.cs
deleted file mode 100644
index 8d06f719..00000000
--- a/CSJ2K/j2k/io/EndianType.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
-* CVS Identifier:
-*
-* $Id: EndianType.java,v 1.10 2000/09/05 09:24:36 grosbois Exp $
-*
-* Interface: EndianType
-*
-* Description: Defines the two types of endianess (i.e. byte
-* ordering).
-*
-*
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-*
-*
-*
-*/
-namespace CSJ2K.j2k.io
-{
-
- /// This interface defines constants for the two types of byte
- /// ordering: little- and big-endian.
- ///
- /// Little-endian is least significant byte first.
- ///
- ///
Big-endian is most significant byte first.
- ///
- ///
This interface defines the constants only. In order to use the
- /// constants in any other class you can either use the fully qualified
- /// name (e.g., EndianType.LITTLE_ENDIAN) or declare this
- /// interface in the implements clause of the class and then access the
- /// identifier directly.
- ///
- ///
- public struct EndianType_Fields
- {
- /// Identifier for big-endian byte ordering (i.e. most significant
- /// byte first)
- ///
- public const int BIG_ENDIAN = 0;
- /// Identifier for little-endian byte ordering (i.e. least
- /// significant byte first)
- ///
- public const int LITTLE_ENDIAN = 1;
- }
- public interface EndianType
- {
- //UPGRADE_NOTE: Members of interface 'EndianType' were extracted into structure 'EndianType_Fields'. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1045'"
-
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/io/RandomAccessIO.cs b/CSJ2K/j2k/io/RandomAccessIO.cs
deleted file mode 100644
index bbefedc4..00000000
--- a/CSJ2K/j2k/io/RandomAccessIO.cs
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
-* CVS Identifier:
-*
-* $Id: RandomAccessIO.java,v 1.15 2001/10/24 12:07:02 grosbois Exp $
-*
-* Interface: RandomAccessIO.java
-*
-* Description: Interface definition for random access I/O.
-*
-*
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-* */
-namespace CSJ2K.j2k.io
-{
-
- /// This abstract class defines the interface to perform random access I/O. It
- /// implements the BinaryDataInput and BinaryDataOutput
- /// interfaces so that binary data input/output can be performed.
- ///
- /// This interface supports streams of up to 2 GB in length.
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public interface RandomAccessIO : BinaryDataInput, BinaryDataOutput
- {
- /// Returns the current position in the stream, which is the position from
- /// where the next byte of data would be read. The first byte in the stream
- /// is in position 0.
- ///
- ///
- /// The offset of the current position, in bytes.
- ///
- ///
- /// If an I/O error ocurred.
- ///
- ///
- int Pos
- {
- get;
-
- }
-
- /// Closes the I/O stream. Prior to closing the stream, any buffered data
- /// (at the bit and byte level) should be written.
- ///
- ///
- /// If an I/O error ocurred.
- ///
- ///
- void close();
-
- /// Returns the current length of the stream, in bytes, taking into account
- /// any buffering.
- ///
- ///
- /// The length of the stream, in bytes.
- ///
- ///
- /// If an I/O error ocurred.
- ///
- ///
- int length();
-
- /// Moves the current position for the next read or write operation to
- /// offset. The offset is measured from the beginning of the stream. The
- /// offset may be set beyond the end of the file, if in write mode. Setting
- /// the offset beyond the end of the file does not change the file
- /// length. The file length will change only by writing after the offset
- /// has been set beyond the end of the file.
- ///
- ///
- /// The offset where to move to.
- ///
- ///
- /// If in read-only and seeking beyond EOF.
- ///
- ///
- /// If an I/O error ocurred.
- ///
- ///
- void seek(int off);
-
- /// Reads a byte of data from the stream. Prior to reading, the stream is
- /// realigned at the byte level.
- ///
- ///
- /// The byte read, as an int.
- ///
- ///
- /// If the end-of file was reached.
- ///
- ///
- /// If an I/O error ocurred.
- ///
- ///
- byte read();
-
- /// Reads up to len bytes of data from this file into an array of
- /// bytes. This method reads repeatedly from the stream until all the bytes
- /// are read. This method blocks until all the bytes are read, the end of
- /// the stream is detected, or an exception is thrown.
- ///
- ///
- /// The buffer into which the data is to be read. It must be long
- /// enough.
- ///
- ///
- /// The index in 'b' where to place the first byte read.
- ///
- ///
- /// The number of bytes to read.
- ///
- ///
- /// If the end-of file was reached before
- /// getting all the necessary data.
- ///
- ///
- /// If an I/O error ocurred.
- ///
- ///
- void readFully(byte[] b, int off, int len);
-
- /// Writes a byte to the stream. Prior to writing, the stream is realigned
- /// at the byte level.
- ///
- ///
- /// The byte to write. The lower 8 bits of b are
- /// written.
- ///
- ///
- /// If an I/O error ocurred.
- ///
- ///
- void write(byte b);
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/quantization/GuardBitsSpec.cs b/CSJ2K/j2k/quantization/GuardBitsSpec.cs
deleted file mode 100644
index d2fe55a0..00000000
--- a/CSJ2K/j2k/quantization/GuardBitsSpec.cs
+++ /dev/null
@@ -1,249 +0,0 @@
-/*
-* CVS identifier:
-*
-* $Id: GuardBitsSpec.java,v 1.13 2000/09/19 14:11:01 grosbois Exp $
-*
-* Class: GuardBitsSpec
-*
-* Description: Guard bits specifications
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-*
-*
-*
-*/
-using CSJ2K.j2k.util;
-namespace CSJ2K.j2k.quantization
-{
-
- /// This class extends ModuleSpec class in order to hold specifications about
- /// number of guard bits in each tile-component.
- ///
- ///
- ///
- ///
- ///
- public class GuardBitsSpec : ModuleSpec
- {
-
- /// Constructs an empty 'GuardBitsSpec' with specified number of tile and
- /// components. This constructor is called by the decoder.
- ///
- ///
- /// Number of tiles
- ///
- ///
- /// Number of components
- ///
- ///
- /// the type of the specification module i.e. tile specific,
- /// component specific or both.
- ///
- ///
- public GuardBitsSpec(int nt, int nc, byte type) : base(nt, nc, type)
- {
- }
-
- /// Constructs a new 'GuardBitsSpec' for the specified number of components
- /// and tiles and the arguments of "-Qguard_bits" option.
- ///
- ///
- /// The number of tiles
- ///
- ///
- /// The number of components
- ///
- ///
- /// the type of the specification module i.e. tile specific,
- /// component specific or both.
- ///
- ///
- /// The ParameterList
- ///
- ///
- public GuardBitsSpec(int nt, int nc, byte type, ParameterList pl) : base(nt, nc, type)
- {
-
- System.String param = pl.getParameter("Qguard_bits");
- if (param == null)
- {
- throw new System.ArgumentException("Qguard_bits option not " + "specified");
- }
-
- // Parse argument
- SupportClass.Tokenizer stk = new SupportClass.Tokenizer(param);
- System.String word; // current word
- byte curSpecType = SPEC_DEF; // Specification type of the
- // current parameter
- bool[] tileSpec = null; // Tiles concerned by the specification
- bool[] compSpec = null; // Components concerned by the specification
- System.Int32 value_Renamed; // value of the guard bits
-
- while (stk.HasMoreTokens())
- {
- word = stk.NextToken().ToLower();
-
- switch (word[0])
- {
-
- case 't': // Tiles specification
- tileSpec = parseIdx(word, nTiles);
- if (curSpecType == SPEC_COMP_DEF)
- curSpecType = SPEC_TILE_COMP;
- else
- curSpecType = SPEC_TILE_DEF;
- break;
-
- case 'c': // Components specification
- compSpec = parseIdx(word, nComp);
- if (curSpecType == SPEC_TILE_DEF)
- curSpecType = SPEC_TILE_COMP;
- else
- curSpecType = SPEC_COMP_DEF;
- break;
-
- default: // Step size value
- try
- {
- value_Renamed = System.Int32.Parse(word);
- }
- catch (System.FormatException)
- {
- throw new System.ArgumentException("Bad parameter for " + "-Qguard_bits option" + " : " + word);
- }
-
- if ((float)value_Renamed <= 0.0f)
- {
- throw new System.ArgumentException("Guard bits value " + "must be positive : " + value_Renamed);
- }
-
-
- if (curSpecType == SPEC_DEF)
- {
- setDefault((System.Object)value_Renamed);
- }
- else if (curSpecType == SPEC_TILE_DEF)
- {
- for (int i = tileSpec.Length - 1; i >= 0; i--)
- if (tileSpec[i])
- {
- setTileDef(i, (System.Object)value_Renamed);
- }
- }
- else if (curSpecType == SPEC_COMP_DEF)
- {
- for (int i = compSpec.Length - 1; i >= 0; i--)
- if (compSpec[i])
- {
- setCompDef(i, (System.Object)value_Renamed);
- }
- }
- else
- {
- for (int i = tileSpec.Length - 1; i >= 0; i--)
- {
- for (int j = compSpec.Length - 1; j >= 0; j--)
- {
- if (tileSpec[i] && compSpec[j])
- {
- setTileCompVal(i, j, (System.Object)value_Renamed);
- }
- }
- }
- }
-
- // Re-initialize
- curSpecType = SPEC_DEF;
- tileSpec = null;
- compSpec = null;
- break;
-
- }
- }
-
- // Check that default value has been specified
- if (getDefault() == null)
- {
- int ndefspec = 0;
- for (int t = nt - 1; t >= 0; t--)
- {
- for (int c = nc - 1; c >= 0; c--)
- {
- if (specValType[t][c] == SPEC_DEF)
- {
- ndefspec++;
- }
- }
- }
-
- // If some tile-component have received no specification, it takes
- // the default value defined in ParameterList
- if (ndefspec != 0)
- {
- setDefault((System.Object)System.Int32.Parse(pl.DefaultParameterList.getParameter("Qguard_bits")));
- }
- else
- {
- // All tile-component have been specified, takes the first
- // tile-component value as default.
- setDefault(getTileCompVal(0, 0));
- switch (specValType[0][0])
- {
-
- case SPEC_TILE_DEF:
- for (int c = nc - 1; c >= 0; c--)
- {
- if (specValType[0][c] == SPEC_TILE_DEF)
- specValType[0][c] = SPEC_DEF;
- }
- tileDef[0] = null;
- break;
-
- case SPEC_COMP_DEF:
- for (int t = nt - 1; t >= 0; t--)
- {
- if (specValType[t][0] == SPEC_COMP_DEF)
- specValType[t][0] = SPEC_DEF;
- }
- compDef[0] = null;
- break;
-
- case SPEC_TILE_COMP:
- specValType[0][0] = SPEC_DEF;
- tileCompVal["t0c0"] = null;
- break;
- }
- }
- }
- }
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/quantization/QuantStepSizeSpec.cs b/CSJ2K/j2k/quantization/QuantStepSizeSpec.cs
deleted file mode 100644
index 31dd3c8d..00000000
--- a/CSJ2K/j2k/quantization/QuantStepSizeSpec.cs
+++ /dev/null
@@ -1,252 +0,0 @@
-/*
-* CVS identifier:
-*
-* $Id: QuantStepSizeSpec.java,v 1.12 2001/10/24 12:05:04 grosbois Exp $
-*
-* Class: QuantStepSizeSpec
-*
-* Description: Quantization base normalized step size specifications
-*
-*
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-* */
-using CSJ2K.j2k.util;
-namespace CSJ2K.j2k.quantization
-{
-
- /// This class extends ModuleSpec class in order to hold specifications about
- /// the quantization base normalized step size to use in each tile-component.
- ///
- ///
- ///
- ///
- ///
- public class QuantStepSizeSpec : ModuleSpec
- {
-
- /// Constructs an empty 'QuantStepSizeSpec' with specified number of
- /// tile and components. This constructor is called by the decoder.
- ///
- ///
- /// Number of tiles
- ///
- ///
- /// Number of components
- ///
- ///
- /// the type of the specification module i.e. tile specific,
- /// component specific or both.
- ///
- ///
- public QuantStepSizeSpec(int nt, int nc, byte type) : base(nt, nc, type)
- {
- }
-
- /// Constructs a new 'QuantStepSizeSpec' for the specified number of
- /// components and tiles and the arguments of "-Qstep" option.
- ///
- ///
- /// The number of tiles
- ///
- ///
- /// The number of components
- ///
- ///
- /// the type of the specification module i.e. tile specific,
- /// component specific or both.
- ///
- ///
- /// The ParameterList
- ///
- ///
- public QuantStepSizeSpec(int nt, int nc, byte type, ParameterList pl) : base(nt, nc, type)
- {
-
- System.String param = pl.getParameter("Qstep");
- if (param == null)
- {
- throw new System.ArgumentException("Qstep option not specified");
- }
-
- // Parse argument
- SupportClass.Tokenizer stk = new SupportClass.Tokenizer(param);
- System.String word; // current word
- byte curSpecType = SPEC_DEF; // Specification type of the
- // current parameter
- bool[] tileSpec = null; // Tiles concerned by the specification
- bool[] compSpec = null; // Components concerned by the specification
- System.Single value_Renamed; // value of the current step size
-
- while (stk.HasMoreTokens())
- {
- word = stk.NextToken().ToLower();
-
- switch (word[0])
- {
-
- case 't': // Tiles specification
- tileSpec = parseIdx(word, nTiles);
- if (curSpecType == SPEC_COMP_DEF)
- curSpecType = SPEC_TILE_COMP;
- else
- curSpecType = SPEC_TILE_DEF;
- break;
-
- case 'c': // Components specification
- compSpec = parseIdx(word, nComp);
- if (curSpecType == SPEC_TILE_DEF)
- curSpecType = SPEC_TILE_COMP;
- else
- curSpecType = SPEC_COMP_DEF;
- break;
-
- default: // Step size value
- try
- {
- //UPGRADE_WARNING: Data types in Visual C# might be different. Verify the accuracy of narrowing conversions. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1042'"
- value_Renamed = System.Single.Parse(word);
- }
- catch (System.FormatException)
- {
- throw new System.ArgumentException("Bad parameter for " + "-Qstep option : " + word);
- }
-
- //UPGRADE_TODO: The equivalent in .NET for method 'java.lang.Float.floatValue' may return a different value. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1043'"
- if ((float)value_Renamed <= 0.0f)
- {
- //UPGRADE_TODO: The equivalent in .NET for method 'java.lang.Float.toString' may return a different value. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1043'"
- throw new System.ArgumentException("Normalized base step " + "must be positive : " + value_Renamed);
- }
-
-
- if (curSpecType == SPEC_DEF)
- {
- setDefault((System.Object)value_Renamed);
- }
- else if (curSpecType == SPEC_TILE_DEF)
- {
- for (int i = tileSpec.Length - 1; i >= 0; i--)
- if (tileSpec[i])
- {
- setTileDef(i, (System.Object)value_Renamed);
- }
- }
- else if (curSpecType == SPEC_COMP_DEF)
- {
- for (int i = compSpec.Length - 1; i >= 0; i--)
- if (compSpec[i])
- {
- setCompDef(i, (System.Object)value_Renamed);
- }
- }
- else
- {
- for (int i = tileSpec.Length - 1; i >= 0; i--)
- {
- for (int j = compSpec.Length - 1; j >= 0; j--)
- {
- if (tileSpec[i] && compSpec[j])
- {
- setTileCompVal(i, j, (System.Object)value_Renamed);
- }
- }
- }
- }
-
- // Re-initialize
- curSpecType = SPEC_DEF;
- tileSpec = null;
- compSpec = null;
- break;
-
- }
- }
-
- // Check that default value has been specified
- if (getDefault() == null)
- {
- int ndefspec = 0;
- for (int t = nt - 1; t >= 0; t--)
- {
- for (int c = nc - 1; c >= 0; c--)
- {
- if (specValType[t][c] == SPEC_DEF)
- {
- ndefspec++;
- }
- }
- }
-
- // If some tile-component have received no specification, it takes
- // the default value defined in ParameterList
- if (ndefspec != 0)
- {
- //UPGRADE_WARNING: Data types in Visual C# might be different. Verify the accuracy of narrowing conversions. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1042'"
- setDefault((System.Object)System.Single.Parse(pl.DefaultParameterList.getParameter("Qstep")));
- }
- else
- {
- // All tile-component have been specified, takes the first
- // tile-component value as default.
- setDefault(getTileCompVal(0, 0));
- switch (specValType[0][0])
- {
-
- case SPEC_TILE_DEF:
- for (int c = nc - 1; c >= 0; c--)
- {
- if (specValType[0][c] == SPEC_TILE_DEF)
- specValType[0][c] = SPEC_DEF;
- }
- tileDef[0] = null;
- break;
-
- case SPEC_COMP_DEF:
- for (int t = nt - 1; t >= 0; t--)
- {
- if (specValType[t][0] == SPEC_COMP_DEF)
- specValType[t][0] = SPEC_DEF;
- }
- compDef[0] = null;
- break;
-
- case SPEC_TILE_COMP:
- specValType[0][0] = SPEC_DEF;
- tileCompVal["t0c0"] = null;
- break;
- }
- }
- }
- }
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/quantization/QuantTypeSpec.cs b/CSJ2K/j2k/quantization/QuantTypeSpec.cs
deleted file mode 100644
index 142bf208..00000000
--- a/CSJ2K/j2k/quantization/QuantTypeSpec.cs
+++ /dev/null
@@ -1,390 +0,0 @@
-/*
-* CVS identifier:
-*
-* $Id: QuantTypeSpec.java,v 1.18 2001/10/24 12:05:18 grosbois Exp $
-*
-* Class: QuantTypeSpec
-*
-* Description: Quantization type specifications
-*
-*
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-* */
-using CSJ2K.j2k.util;
-namespace CSJ2K.j2k.quantization
-{
-
- /// This class extends ModuleSpec class in order to hold specifications about
- /// the quantization type to use in each tile-component. Supported quantization
- /// type are:
- ///
- ///
- /// - Reversible (no quantization)
- /// - Derived (the quantization step size is derived from the one of the
- /// LL-subband)
- /// - Expounded (the quantization step size of each subband is signalled in
- /// the codestream headers)
- ///
- ///
- ///
- ///
- ///
- ///
- public class QuantTypeSpec : ModuleSpec
- {
- /// Check the reversibility of the whole image.
- ///
- ///
- /// Whether or not the whole image is reversible
- ///
- ///
- virtual public bool FullyReversible
- {
- get
- {
- // The whole image is reversible if default specification is
- // rev and no tile default, component default and
- // tile-component value has been specificied
- if (((System.String)getDefault()).Equals("reversible"))
- {
- for (int t = nTiles - 1; t >= 0; t--)
- for (int c = nComp - 1; c >= 0; c--)
- if (specValType[t][c] != SPEC_DEF)
- return false;
- return true;
- }
-
- return false;
- }
-
- }
- /// Check the irreversibility of the whole image.
- ///
- ///
- /// Whether or not the whole image is reversible
- ///
- ///
- virtual public bool FullyNonReversible
- {
- get
- {
- // The whole image is irreversible no tile-component is reversible
- for (int t = nTiles - 1; t >= 0; t--)
- for (int c = nComp - 1; c >= 0; c--)
- if (((System.String)getSpec(t, c)).Equals("reversible"))
- return false;
- return true;
- }
-
- }
-
- /// Constructs an empty 'QuantTypeSpec' with the specified number of tiles
- /// and components. This constructor is called by the decoder.
- ///
- ///
- /// Number of tiles
- ///
- ///
- /// Number of components
- ///
- ///
- /// the type of the allowed specifications for this module
- /// i.e. tile specific, component specific or both.
- ///
- ///
- public QuantTypeSpec(int nt, int nc, byte type) : base(nt, nc, type)
- {
- }
-
-
- /// Constructs a new 'QuantTypeSpec' for the specified number of components
- /// and tiles and the arguments of "-Qtype" option. This constructor is
- /// called by the encoder.
- ///
- ///
- /// The number of tiles
- ///
- ///
- /// The number of components
- ///
- ///
- /// the type of the specification module i.e. tile specific,
- /// component specific or both.
- ///
- ///
- /// The ParameterList
- ///
- ///
- public QuantTypeSpec(int nt, int nc, byte type, ParameterList pl) : base(nt, nc, type)
- {
-
- System.String param = pl.getParameter("Qtype");
- if (param == null)
- {
- if (pl.getBooleanParameter("lossless"))
- {
- setDefault("reversible");
- }
- else
- {
- setDefault("expounded");
- }
- return;
- }
-
- // Parse argument
- SupportClass.Tokenizer stk = new SupportClass.Tokenizer(param);
- System.String word; // current word
- byte curSpecValType = SPEC_DEF; // Specification type of the
- // current parameter
- bool[] tileSpec = null; // Tiles concerned by the specification
- bool[] compSpec = null; // Components concerned by the specification
-
- while (stk.HasMoreTokens())
- {
- word = stk.NextToken().ToLower();
-
- switch (word[0])
- {
-
- case 't': // Tiles specification
- tileSpec = parseIdx(word, nTiles);
-
- if (curSpecValType == SPEC_COMP_DEF)
- {
- curSpecValType = SPEC_TILE_COMP;
- }
- else
- {
- curSpecValType = SPEC_TILE_DEF;
- }
- break;
-
- case 'c': // Components specification
- compSpec = parseIdx(word, nComp);
-
- if (curSpecValType == SPEC_TILE_DEF)
- {
- curSpecValType = SPEC_TILE_COMP;
- }
- else
- {
- curSpecValType = SPEC_COMP_DEF;
- }
- break;
-
- case 'r':
- // reversible specification
- case 'd':
- // derived quantization step size specification
- case 'e': // expounded quantization step size specification
- if (!word.ToUpper().Equals("reversible".ToUpper()) && !word.ToUpper().Equals("derived".ToUpper()) && !word.ToUpper().Equals("expounded".ToUpper()))
- {
- throw new System.ArgumentException("Unknown parameter " + "for " + "'-Qtype' option: " + word);
- }
-
- if (pl.getBooleanParameter("lossless") && (word.ToUpper().Equals("derived".ToUpper()) || word.ToUpper().Equals("expounded".ToUpper())))
- {
- throw new System.ArgumentException("Cannot use non " + "reversible " + "quantization with " + "'-lossless' option");
- }
-
- if (curSpecValType == SPEC_DEF)
- {
- // Default specification
- setDefault(word);
- }
- else if (curSpecValType == SPEC_TILE_DEF)
- {
- // Tile default specification
- for (int i = tileSpec.Length - 1; i >= 0; i--)
- {
- if (tileSpec[i])
- {
- setTileDef(i, word);
- }
- }
- }
- else if (curSpecValType == SPEC_COMP_DEF)
- {
- // Component default specification
- for (int i = compSpec.Length - 1; i >= 0; i--)
- if (compSpec[i])
- {
- setCompDef(i, word);
- }
- }
- else
- {
- // Tile-component specification
- for (int i = tileSpec.Length - 1; i >= 0; i--)
- {
- for (int j = compSpec.Length - 1; j >= 0; j--)
- {
- if (tileSpec[i] && compSpec[j])
- {
- setTileCompVal(i, j, word);
- }
- }
- }
- }
-
- // Re-initialize
- curSpecValType = SPEC_DEF;
- tileSpec = null;
- compSpec = null;
- break;
-
-
- default:
- throw new System.ArgumentException("Unknown parameter for " + "'-Qtype' option: " + word);
-
- }
- }
-
- // Check that default value has been specified
- if (getDefault() == null)
- {
- int ndefspec = 0;
- for (int t = nt - 1; t >= 0; t--)
- {
- for (int c = nc - 1; c >= 0; c--)
- {
- if (specValType[t][c] == SPEC_DEF)
- {
- ndefspec++;
- }
- }
- }
-
- // If some tile-component have received no specification, the
- // quantization type is 'reversible' (if '-lossless' is specified)
- // or 'expounded' (if not).
- if (ndefspec != 0)
- {
- if (pl.getBooleanParameter("lossless"))
- {
- setDefault("reversible");
- }
- else
- {
- setDefault("expounded");
- }
- }
- else
- {
- // All tile-component have been specified, takes arbitrarily
- // the first tile-component value as default and modifies the
- // specification type of all tile-component sharing this
- // value.
- setDefault(getTileCompVal(0, 0));
-
- switch (specValType[0][0])
- {
-
- case SPEC_TILE_DEF:
- for (int c = nc - 1; c >= 0; c--)
- {
- if (specValType[0][c] == SPEC_TILE_DEF)
- specValType[0][c] = SPEC_DEF;
- }
- tileDef[0] = null;
- break;
-
- case SPEC_COMP_DEF:
- for (int t = nt - 1; t >= 0; t--)
- {
- if (specValType[t][0] == SPEC_COMP_DEF)
- specValType[t][0] = SPEC_DEF;
- }
- compDef[0] = null;
- break;
-
- case SPEC_TILE_COMP:
- specValType[0][0] = SPEC_DEF;
- tileCompVal["t0c0"] = null;
- break;
- }
- }
- }
- }
-
- /// Returns true if given tile-component uses derived quantization step
- /// size.
- ///
- ///
- /// Tile index
- ///
- ///
- /// Component index
- ///
- ///
- /// True if derived quantization step size
- ///
- ///
- public virtual bool isDerived(int t, int c)
- {
- if (((System.String)getTileCompVal(t, c)).Equals("derived"))
- {
- return true;
- }
- else
- {
- return false;
- }
- }
-
- /// Check the reversibility of the given tile-component.
- ///
- ///
- /// The index of the tile
- ///
- ///
- /// The index of the component
- ///
- ///
- /// Whether or not the tile-component is reversible
- ///
- ///
- public virtual bool isReversible(int t, int c)
- {
- if (((System.String)getTileCompVal(t, c)).Equals("reversible"))
- {
- return true;
- }
- else
- {
- return false;
- }
- }
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/quantization/QuantizationType.cs b/CSJ2K/j2k/quantization/QuantizationType.cs
deleted file mode 100644
index 255d692d..00000000
--- a/CSJ2K/j2k/quantization/QuantizationType.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
-* CVS identifier:
-*
-* $Id: QuantizationType.java,v 1.10 2000/09/19 14:11:30 grosbois Exp $
-*
-* Class: QuantizationType
-*
-* Description: This interface defines the possible
-* quantization types.
-*
-*
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-*
-*
-*
-*/
-namespace CSJ2K.j2k.quantization
-{
-
- /// This interface defines the IDs of the possible quantization types. JPEG
- /// 2000 part I support only the scalar quantization with dead zone. However
- /// other quantization type may be defined in JPEG 2000 extensions (for
- /// instance Trellis Coded Quantization).
- ///
- /// This interface defines the constants only. In order to use the
- /// constants in any other class you can either use the fully qualified
- /// name (e.g., QuantizationType.Q_TYPE_SCALAR_DZ) or declare
- /// this interface in the implements clause of the class and then
- /// access the identifier directly.
- ///
- ///
- public struct QuantizationType_Fields
- {
- /// The ID of the scalar deadzone dequantizer
- public readonly static int Q_TYPE_SCALAR_DZ = 0;
- }
- public interface QuantizationType
- {
- //UPGRADE_NOTE: Members of interface 'QuantizationType' were extracted into structure 'QuantizationType_Fields'. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1045'"
-
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/quantization/dequantizer/CBlkQuantDataSrcDec.cs b/CSJ2K/j2k/quantization/dequantizer/CBlkQuantDataSrcDec.cs
deleted file mode 100644
index 70348fda..00000000
--- a/CSJ2K/j2k/quantization/dequantizer/CBlkQuantDataSrcDec.cs
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
-* CVS identifier:
-*
-* $Id: CBlkQuantDataSrcDec.java,v 1.9 2001/09/14 08:58:36 grosbois Exp $
-*
-* Class: CBlkQuantDataSrcDec
-*
-* Description: Interface that defines a source of
-* quantized wavelet data to be transferred in a
-* code-block by code-block basis (decoder side).
-*
-*
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-* */
-using CSJ2K.j2k.entropy.decoder;
-using CSJ2K.j2k.image;
-using CSJ2K.j2k.wavelet.synthesis;
-namespace CSJ2K.j2k.quantization.dequantizer
-{
-
- /// This interface defines a source of quantized wavelet coefficients and
- /// methods to transfer them in a code-block by code-block basis, fro the
- /// decoder side. In each call to 'getCodeBlock()' or 'getInternCodeBlock()' a
- /// new code-block is returned.
- ///
- /// This class is the source of data for the dequantizer. See the
- /// 'Dequantizer' class.
- ///
- ///
Code-block data is returned in sign-magnitude representation, instead of
- /// the normal two's complement one. Only integral types are used. The sign
- /// magnitude representation is more adequate for entropy coding. In sign
- /// magnitude representation, the most significant bit is used for the sign (0
- /// if positive, 1 if negative) and the magnitude of the coefficient is stored
- /// in the next M most significant bits. The rest of the bits (least
- /// significant bits) can contain a fractional value of the quantized
- /// coefficient. The number 'M' of magnitude bits is communicated in the
- /// 'magbits' member variable of the 'CBlkWTData'.
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public interface CBlkQuantDataSrcDec : InvWTData
- {
-
- /// Returns the specified code-block in the current tile for the specified
- /// component, as a copy (see below).
- ///
- /// The returned code-block may be progressive, which is indicated by
- /// the 'progressive' variable of the returned 'DataBlk' object. If a
- /// code-block is progressive it means that in a later request to this
- /// method for the same code-block it is possible to retrieve data which is
- /// a better approximation, since meanwhile more data to decode for the
- /// code-block could have been received. If the code-block is not
- /// progressive then later calls to this method for the same code-block
- /// will return the exact same data values.
- ///
- /// The data returned by this method is always a copy of the internal
- /// data of this object, if any, and it can be modified "in place" without
- /// any problems after being returned. The 'offset' of the returned data is
- /// 0, and the 'scanw' is the same as the code-block width. See the
- /// 'DataBlk' class.
- ///
- /// The 'ulx' and 'uly' members of the returned 'DataBlk' object contain
- /// the coordinates of the top-left corner of the block, with respect to
- /// the tile, not the subband.
- ///
- ///
- /// The component for which to return the next code-block.
- ///
- ///
- /// The vertical index of the code-block to return, in the
- /// specified subband.
- ///
- ///
- /// The horizontal index of the code-block to return, in the
- /// specified subband.
- ///
- ///
- /// The subband in which the code-block to return is.
- ///
- ///
- /// If non-null this object will be used to return the new
- /// code-block. If null a new one will be allocated and returned. If the
- /// "data" array of the object is non-null it will be reused, if possible,
- /// to return the data.
- ///
- ///
- /// The next code-block in the current tile for component 'n', or
- /// null if all code-blocks for the current tile have been returned.
- ///
- ///
- ///
- ///
- ///
- DataBlk getCodeBlock(int c, int m, int n, SubbandSyn sb, DataBlk cblk);
-
- /// Returns the specified code-block in the current tile for the specified
- /// component (as a reference or copy).
- ///
- /// The returned code-block may be progressive, which is indicated by
- /// the 'progressive' variable of the returned 'DataBlk' object. If a
- /// code-block is progressive it means that in a later request to this
- /// method for the same code-block it is possible to retrieve data which is
- /// a better approximation, since meanwhile more data to decode for the
- /// code-block could have been received. If the code-block is not
- /// progressive then later calls to this method for the same code-block
- /// will return the exact same data values.
- ///
- /// The data returned by this method can be the data in the internal
- /// buffer of this object, if any, and thus can not be modified by the
- /// caller. The 'offset' and 'scanw' of the returned data can be
- /// arbitrary. See the 'DataBlk' class.
- ///
- /// The 'ulx' and 'uly' members of the returned 'DataBlk' object contain
- /// the coordinates of the top-left corner of the block, with respect to
- /// the tile, not the subband.
- ///
- ///
- /// The component for which to return the next code-block.
- ///
- ///
- /// The vertical index of the code-block to return, in the
- /// specified subband.
- ///
- ///
- /// The horizontal index of the code-block to return, in the
- /// specified subband.
- ///
- ///
- /// The subband in which the code-block to return is.
- ///
- ///
- /// If non-null this object will be used to return the new
- /// code-block. If null a new one will be allocated and returned. If the
- /// "data" array of the object is non-null it will be reused, if possible,
- /// to return the data.
- ///
- ///
- /// The next code-block in the current tile for component 'n', or
- /// null if all code-blocks for the current tile have been returned.
- ///
- ///
- ///
- ///
- ///
- DataBlk getInternCodeBlock(int c, int m, int n, SubbandSyn sb, DataBlk cblk);
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/quantization/dequantizer/Dequantizer.cs b/CSJ2K/j2k/quantization/dequantizer/Dequantizer.cs
deleted file mode 100644
index 64f5c5e5..00000000
--- a/CSJ2K/j2k/quantization/dequantizer/Dequantizer.cs
+++ /dev/null
@@ -1,339 +0,0 @@
-/*
-* CVS identifier:
-*
-* $Id: Dequantizer.java,v 1.37 2001/10/29 20:07:28 qtxjoas Exp $
-*
-* Class: Dequantizer
-*
-* Description: The abstract class for all dequantizers.
-*
-*
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-* */
-using CSJ2K.j2k.decoder;
-using CSJ2K.j2k.image;
-using CSJ2K.j2k.image.invcomptransf;
-using CSJ2K.j2k.wavelet;
-using CSJ2K.j2k.wavelet.synthesis;
-namespace CSJ2K.j2k.quantization.dequantizer
-{
-
- /// This is the abstract class from which all dequantizers must inherit. This
- /// class has the concept of a current tile and all operations are performed on
- /// the current tile.
- ///
- /// This class provides default implemenations for most of the methods
- /// (wherever it makes sense), under the assumption that the image and
- /// component dimensions, and the tiles, are not modifed by the dequantizer. If
- /// that is not the case for a particular implementation then the methods
- /// should be overriden.
- ///
- /// Sign magnitude representation is used (instead of two's complement) for
- /// the input data. The most significant bit is used for the sign (0 if
- /// positive, 1 if negative). Then the magnitude of the quantized coefficient
- /// is stored in the next most significat bits. The most significant magnitude
- /// bit corresponds to the most significant bit-plane and so on.
- ///
- /// The output data is either in floating-point, or in fixed-point two's
- /// complement. In case of floating-point data the the value returned by
- /// getFixedPoint() must be 0. If the case of fixed-point data the number of
- /// fractional bits must be defined at the constructor of the implementing
- /// class and all operations must be performed accordingly. Each component may
- /// have a different number of fractional bits.
- ///
- ///
- public abstract class Dequantizer : MultiResImgDataAdapter, CBlkWTDataSrcDec
- {
- /// Returns the horizontal code-block partition origin. Allowable values
- /// are 0 and 1, nothing else.
- ///
- ///
- virtual public int CbULX
- {
- get
- {
- return src.CbULX;
- }
-
- }
- /// Returns the vertical code-block partition origin. Allowable values are
- /// 0 and 1, nothing else.
- ///
- ///
- virtual public int CbULY
- {
- get
- {
- return src.CbULY;
- }
-
- }
- /// Returns the parameters that are used in this class and
- /// implementing classes. It returns a 2D String array. Each of the
- /// 1D arrays is for a different option, and they have 3
- /// elements. The first element is the option name, the second one
- /// is the synopsis and the third one is a long description of what
- /// the parameter is. The synopsis or description may be 'null', in
- /// which case it is assumed that there is no synopsis or
- /// description of the option, respectively. Null may be returned
- /// if no options are supported.
- ///
- ///
- /// the options name, their synopsis and their explanation,
- /// or null if no options are supported.
- ///
- ///
- public static System.String[][] ParameterInfo
- {
- get
- {
- return pinfo;
- }
-
- }
-
- /// The prefix for dequantizer options: 'Q'
- public const char OPT_PREFIX = 'Q';
-
- /// The list of parameters that is accepted by the bit stream
- /// readers. They start with 'Q'
- ///
- //UPGRADE_NOTE: Final was removed from the declaration of 'pinfo'. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private static readonly System.String[][] pinfo = null;
-
- /// The entropy decoder from where to get the quantized data (the
- /// source).
- ///
- protected internal CBlkQuantDataSrcDec src;
-
- /// The "range bits" for each transformed component
- protected internal int[] rb = null;
-
- /// The "range bits" for each un-transformed component
- protected internal int[] utrb = null;
-
- /// The inverse component transformation specifications
- private CompTransfSpec cts;
-
- /// Reference to the wavelet filter specifications
- private SynWTFilterSpec wfs;
-
- /// Initializes the source of compressed data.
- ///
- ///
- /// From where to obtain the quantized data.
- ///
- ///
- /// The number of "range bits" for each component (must be the
- /// "range bits" of the un-transformed components. For a definition of
- /// "range bits" see the getNomRangeBits() method.
- ///
- ///
- ///
- ///
- ///
- public Dequantizer(CBlkQuantDataSrcDec src, int[] utrb, DecoderSpecs decSpec) : base(src)
- {
- if (utrb.Length != src.NumComps)
- {
- throw new System.ArgumentException();
- }
- this.src = src;
- this.utrb = utrb;
- this.cts = decSpec.cts;
- this.wfs = decSpec.wfs;
- }
-
- /// Returns the number of bits, referred to as the "range bits",
- /// corresponding to the nominal range of the data in the specified
- /// component.
- ///
- /// The returned value corresponds to the nominal dynamic range of the
- /// reconstructed image data, not of the wavelet coefficients
- /// themselves. This is because different subbands have different gains and
- /// thus different nominal ranges. To have an idea of the nominal range in
- /// each subband the subband analysis gain value from the subband tree
- /// structure, returned by the getSynSubbandTree() method, can be used. See
- /// the Subband class for more details.
- ///
- /// If this number is b then for unsigned data the nominal range
- /// is between 0 and 2^b-1, and for signed data it is between -2^(b-1) and
- /// 2^(b-1)-1.
- ///
- ///
- /// The index of the component
- ///
- ///
- /// The number of bits corresponding to the nominal range of the
- /// data.
- ///
- ///
- ///
- ///
- ///
- public virtual int getNomRangeBits(int c)
- {
- return rb[c];
- }
-
- /// Returns the subband tree, for the specified tile-component. This method
- /// returns the root element of the subband tree structure, see Subband and
- /// SubbandSyn. The tree comprises all the available resolution levels.
- ///
- /// The number of magnitude bits ('magBits' member variable) for each
- /// subband may have not been not initialized (it depends on the actual
- /// dequantizer and its implementation). However, they are not necessary
- /// for the subsequent steps in the decoder chain.
- ///
- ///
- /// The index of the tile, from 0 to T-1.
- ///
- ///
- /// The index of the component, from 0 to C-1.
- ///
- ///
- /// The root of the tree structure.
- ///
- ///
- public override SubbandSyn getSynSubbandTree(int t, int c)
- {
- return src.getSynSubbandTree(t, c);
- }
-
- /// Changes the current tile, given the new indexes. An
- /// IllegalArgumentException is thrown if the indexes do not
- /// correspond to a valid tile.
- ///
- /// This default implementation changes the tile in the source
- /// and re-initializes properly component transformation variables..
- ///
- ///
- /// The horizontal index of the tile.
- ///
- ///
- /// The vertical index of the new tile.
- ///
- ///
- public override void setTile(int x, int y)
- {
- src.setTile(x, y);
- tIdx = TileIdx; // index of the current tile
-
- // initializations
- int cttype = 0;
- if (((System.Int32)cts.getTileDef(tIdx)) == InvCompTransf.NONE)
- cttype = InvCompTransf.NONE;
- else
- {
- int nc = src.NumComps > 3 ? 3 : src.NumComps;
- int rev = 0;
- for (int c = 0; c < nc; c++)
- rev += (wfs.isReversible(tIdx, c) ? 1 : 0);
- if (rev == 3)
- {
- // All WT are reversible
- cttype = InvCompTransf.INV_RCT;
- }
- else if (rev == 0)
- {
- // All WT irreversible
- cttype = InvCompTransf.INV_ICT;
- }
- else
- {
- // Error
- throw new System.ArgumentException("Wavelet transformation " + "and " + "component transformation" + " not coherent in tile" + tIdx);
- }
- }
-
- switch (cttype)
- {
-
- case InvCompTransf.NONE:
- rb = utrb;
- break;
-
- case InvCompTransf.INV_RCT:
- rb = InvCompTransf.calcMixedBitDepths(utrb, InvCompTransf.INV_RCT, null);
- break;
-
- case InvCompTransf.INV_ICT:
- rb = InvCompTransf.calcMixedBitDepths(utrb, InvCompTransf.INV_ICT, null);
- break;
-
- default:
- throw new System.ArgumentException("Non JPEG 2000 part I " + "component" + " transformation for tile: " + tIdx);
-
- }
- }
-
- /// Advances to the next tile, in standard scan-line order (by rows then
- /// columns). An NoNextElementException is thrown if the current tile is
- /// the last one (i.e. there is no next tile).
- ///
- /// This default implementation just advances to the next tile in the
- /// source and re-initializes properly component transformation variables.
- ///
- ///
- public override void nextTile()
- {
- src.nextTile();
- tIdx = TileIdx; // index of the current tile
-
- // initializations
- int cttype = ((System.Int32)cts.getTileDef(tIdx));
- switch (cttype)
- {
-
- case InvCompTransf.NONE:
- rb = utrb;
- break;
-
- case InvCompTransf.INV_RCT:
- rb = InvCompTransf.calcMixedBitDepths(utrb, InvCompTransf.INV_RCT, null);
- break;
-
- case InvCompTransf.INV_ICT:
- rb = InvCompTransf.calcMixedBitDepths(utrb, InvCompTransf.INV_ICT, null);
- break;
-
- default:
- throw new System.ArgumentException("Non JPEG 2000 part I " + "component" + " transformation for tile: " + tIdx);
-
- }
- }
- public abstract CSJ2K.j2k.image.DataBlk getCodeBlock(int param1, int param2, int param3, CSJ2K.j2k.wavelet.synthesis.SubbandSyn param4, CSJ2K.j2k.image.DataBlk param5);
- public abstract int getFixedPoint(int param1);
- public abstract CSJ2K.j2k.image.DataBlk getInternCodeBlock(int param1, int param2, int param3, CSJ2K.j2k.wavelet.synthesis.SubbandSyn param4, CSJ2K.j2k.image.DataBlk param5);
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/quantization/dequantizer/DequantizerParams.cs b/CSJ2K/j2k/quantization/dequantizer/DequantizerParams.cs
deleted file mode 100644
index b4e7b485..00000000
--- a/CSJ2K/j2k/quantization/dequantizer/DequantizerParams.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
-* CVS identifier:
-*
-* $Id: DequantizerParams.java,v 1.16 2000/09/19 14:11:54 grosbois Exp $
-*
-* Class: DequantizerParams
-*
-* Description: Generic class to hold dequantizer
-* parameters.
-*
-*
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-*/
-namespace CSJ2K.j2k.quantization.dequantizer
-{
-
- /// This is the generic ineterface for dequantization parameters. Generally,
- /// for each type of dequantizer, there should be a corresponding class to
- /// store its parameters. The parameters are those that come from the bit
- /// stream header, that concern dequantization.
- ///
- ///
- public abstract class DequantizerParams
- {
- /// Returns the type of the dequantizer for which the parameters are. The
- /// types are defined in the Dequantizer class.
- ///
- ///
- /// The type of the dequantizer for which the parameters
- /// are.
- ///
- ///
- ///
- ///
- ///
- public abstract int DequantizerType { get; }
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/quantization/dequantizer/StdDequantizer.cs b/CSJ2K/j2k/quantization/dequantizer/StdDequantizer.cs
deleted file mode 100644
index 9255b1f7..00000000
--- a/CSJ2K/j2k/quantization/dequantizer/StdDequantizer.cs
+++ /dev/null
@@ -1,404 +0,0 @@
-/*
-* CVS identifier:
-*
-* $Id: StdDequantizer.java,v 1.15 2002/07/19 12:50:23 grosbois Exp $
-*
-* Class: StdDequantizer
-*
-* Description: Scalar deadzone dequantizer that returns integers
-* or floats.
-* This is a merger of the ScalarDZDeqInt and
-* ScalarDZDeqFloat classes by Joel Askelof and Diego
-* Santa Cruz.
-*
-*
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-* */
-using CSJ2K.j2k.decoder;
-using CSJ2K.j2k.image;
-using CSJ2K.j2k.wavelet.synthesis;
-namespace CSJ2K.j2k.quantization.dequantizer
-{
-
- /// This class implements a scalar dequantizer with deadzone. The output can be
- /// either integer ('int') or floating-point ('float') data. The dequantization
- /// step sizes and other parameters are taken from a StdDequantizerParams
- /// class, which inherits from DequantizerParams.
- ///
- /// Sign magnitude representation is used (instead of two's complement) for
- /// the input data. The most significant bit is used for the sign (0 if
- /// positive, 1 if negative). Then the magnitude of the quantized coefficient
- /// is stored in the next most significat bits. The most significant magnitude
- /// bit corresponds to the most significant bit-plane and so on.
- ///
- /// When reversible quantization is used, this class only converts between
- /// the sign-magnitude representation and the integer (or eventually
- /// fixed-point) output, since there is no true quantization.
- ///
- /// The output data is fixed-point two's complement for 'int' output and
- /// floating-point for 'float' output. The type of output and the number number
- /// of fractional bits for 'int' output are defined at the constructor. Each
- /// component may have a different number of fractional bits.
- ///
- /// The reconstruction levels used by the dequantizer are exactly what is
- /// received from the entropy decoder. It is assumed that the entropy decoder
- /// always returns codewords that are midways in the decoded intervals. In this
- /// way the dequantized values will always lie midways in the quantization
- /// intervals.
- ///
- ///
- public class StdDequantizer : Dequantizer
- {
-
- /// The quantizer type spec
- private QuantTypeSpec qts;
-
- /// The quantizer step sizes spec
- private QuantStepSizeSpec qsss;
-
- /// The number of guard bits spec
- private GuardBitsSpec gbs;
-
- /// The decoding parameters of the dequantizer
- //private StdDequantizerParams params_Renamed;
-
- /// The 'DataBlkInt' object used to request data, used when output data is
- /// not int
- ///
- private DataBlkInt inblk;
-
- /// Type of the current output data
- private int outdtype;
-
- /// Initializes the source of compressed data. And sets the number of range
- /// bits and fraction bits and receives the parameters for the dequantizer.
- ///
- ///
- /// From where to obtain the quantized data.
- ///
- ///
- /// The number of "range bits" (bitdepth) for each component
- /// (must be the "range bits" of the un-transformed components). For a
- /// definition of "range bits" see the getNomRangeBits() method.
- ///
- ///
- /// The quantizer type spec
- ///
- ///
- /// The dequantizer step sizes spec
- ///
- ///
- ///
- ///
- ///
- /// Thrown if 'outdt' is neither
- /// TYPE_FLOAT nor TYPE_INT, or if 'param' specify reversible quantization
- /// and 'outdt' is not TYPE_INT or 'fp' has non-zero values, or if 'outdt'
- /// is TYPE_FLOAT and 'fp' has non-zero values.
- ///
- ///
- public StdDequantizer(CBlkQuantDataSrcDec src, int[] utrb, DecoderSpecs decSpec) : base(src, utrb, decSpec)
- {
-
- if (utrb.Length != src.NumComps)
- {
- throw new System.ArgumentException("Invalid rb argument");
- }
- this.qsss = decSpec.qsss;
- this.qts = decSpec.qts;
- this.gbs = decSpec.gbs;
- }
-
- /// Returns the position of the fixed point in the output data for the
- /// specified component. This is the position of the least significant
- /// integral (i.e. non-fractional) bit, which is equivalent to the number
- /// of fractional bits. For instance, for fixed-point values with 2
- /// fractional bits, 2 is returned. For floating-point data this value does
- /// not apply and 0 should be returned. Position 0 is the position of the
- /// least significant bit in the data. If the output data is 'float' then 0
- /// is always returned.
- ///
- /// Note: Fractional bits are no more supported by JJ2000.
- ///
- ///
- /// The index of the component.
- ///
- ///
- /// The position of the fixed-point, which is the same as the
- /// number of fractional bits. For floating-point data 0 is returned.
- ///
- ///
- public override int getFixedPoint(int c)
- {
- return 0;
- }
-
- /// Returns the specified code-block in the current tile for the specified
- /// component, as a copy (see below).
- ///
- /// The returned code-block may be progressive, which is indicated by
- /// the 'progressive' variable of the returned 'DataBlk' object. If a
- /// code-block is progressive it means that in a later request to this
- /// method for the same code-block it is possible to retrieve data which is
- /// a better approximation, since meanwhile more data to decode for the
- /// code-block could have been received. If the code-block is not
- /// progressive then later calls to this method for the same code-block
- /// will return the exact same data values.
- ///
- /// The data returned by this method is always a copy of the internal
- /// data of this object, if any, and it can be modified "in place" without
- /// any problems after being returned. The 'offset' of the returned data is
- /// 0, and the 'scanw' is the same as the code-block width. See the
- /// 'DataBlk' class.
- ///
- ///
- /// The component for which to return the next code-block.
- ///
- ///
- /// The vertical index of the code-block to return, in the
- /// specified subband.
- ///
- ///
- /// The horizontal index of the code-block to return, in the
- /// specified subband.
- ///
- ///
- /// The subband in which the code-block to return is.
- ///
- ///
- /// If non-null this object will be used to return the new
- /// code-block. If null a new one will be allocated and returned. If the
- /// "data" array of the object is non-null it will be reused, if possible,
- /// to return the data.
- ///
- ///
- /// The next code-block in the current tile for component 'n', or
- /// null if all code-blocks for the current tile have been returned.
- ///
- ///
- ///
- ///
- ///
- public override DataBlk getCodeBlock(int c, int m, int n, SubbandSyn sb, DataBlk cblk)
- {
- return getInternCodeBlock(c, m, n, sb, cblk);
- }
-
- /// Returns the specified code-block in the current tile for the specified
- /// component (as a reference or copy).
- ///
- /// The returned code-block may be progressive, which is indicated by
- /// the 'progressive' variable of the returned 'DataBlk'
- /// object. If a code-block is progressive it means that in a later request
- /// to this method for the same code-block it is possible to retrieve data
- /// which is a better approximation, since meanwhile more data to decode
- /// for the code-block could have been received. If the code-block is not
- /// progressive then later calls to this method for the same code-block
- /// will return the exact same data values.
- ///
- /// The data returned by this method can be the data in the internal
- /// buffer of this object, if any, and thus can not be modified by the
- /// caller. The 'offset' and 'scanw' of the returned data can be
- /// arbitrary. See the 'DataBlk' class.
- ///
- ///
- /// The component for which to return the next code-block.
- ///
- ///
- /// The vertical index of the code-block to return, in the
- /// specified subband.
- ///
- ///
- /// The horizontal index of the code-block to return, in the
- /// specified subband.
- ///
- ///
- /// The subband in which the code-block to return is.
- ///
- ///
- /// If non-null this object will be used to return the new
- /// code-block. If null a new one will be allocated and returned. If the
- /// "data" array of the object is non-null it will be reused, if possible,
- /// to return the data.
- ///
- ///
- /// The next code-block in the current tile for component 'n', or
- /// null if all code-blocks for the current tile have been returned.
- ///
- ///
- ///
- ///
- ///
- public override DataBlk getInternCodeBlock(int c, int m, int n, SubbandSyn sb, DataBlk cblk)
- {
- // This method is declared final since getNextCodeBlock() relies on
- // the actual implementation of this method.
- int j, jmin, k;
- int temp;
- float step;
- int shiftBits;
- int magBits;
- int[] outiarr, inarr;
- float[] outfarr;
- int w, h;
- bool reversible = qts.isReversible(tIdx, c);
- bool derived = qts.isDerived(tIdx, c);
- StdDequantizerParams params_Renamed = (StdDequantizerParams)qsss.getTileCompVal(tIdx, c);
- int G = ((System.Int32)gbs.getTileCompVal(tIdx, c));
-
- outdtype = cblk.DataType;
-
- if (reversible && outdtype != DataBlk.TYPE_INT)
- {
- throw new System.ArgumentException("Reversible quantizations " + "must use int data");
- }
-
- // To get compiler happy
- outiarr = null;
- outfarr = null;
- inarr = null;
-
- // Get source data and initialize output DataBlk object.
- switch (outdtype)
- {
-
- case DataBlk.TYPE_INT:
- // With int data we can use the same DataBlk object to get the
- // data from the source and return the dequantized data, and we
- // can also work "in place" (i.e. same buffer).
- cblk = src.getCodeBlock(c, m, n, sb, cblk);
- // Input and output arrays are the same
- outiarr = (int[])cblk.Data;
- break;
-
- case DataBlk.TYPE_FLOAT:
- // With float data we must use a different DataBlk objects to get
- // the data from the source and to return the dequantized data.
- inblk = (DataBlkInt)src.getInternCodeBlock(c, m, n, sb, inblk);
- inarr = inblk.DataInt;
- if (cblk == null)
- {
- cblk = new DataBlkFloat();
- }
- // Copy the attributes of the CodeBlock object
- cblk.ulx = inblk.ulx;
- cblk.uly = inblk.uly;
- cblk.w = inblk.w;
- cblk.h = inblk.h;
- cblk.offset = 0;
- cblk.scanw = cblk.w;
- cblk.progressive = inblk.progressive;
- // Get output data array and check its size
- outfarr = (float[])cblk.Data;
- if (outfarr == null || outfarr.Length < cblk.w * cblk.h)
- {
- outfarr = new float[cblk.w * cblk.h];
- cblk.Data = outfarr;
- }
- break;
- }
-
- magBits = sb.magbits;
-
- // Calculate quantization step and number of magnitude bits
- // depending on reversibility and derivedness and perform
- // inverse quantization
- if (reversible)
- {
- shiftBits = 31 - magBits;
- // For int data Inverse quantization happens "in-place". The input
- // array has an offset of 0 and scan width equal to the code-block
- // width.
- for (j = outiarr.Length - 1; j >= 0; j--)
- {
- temp = outiarr[j]; // input array is same as output one
- outiarr[j] = (temp >= 0) ? (temp >> shiftBits) : -((temp & 0x7FFFFFFF) >> shiftBits);
- }
- }
- else
- {
- // Not reversible
- if (derived)
- {
- // Max resolution level
- int mrl = src.getSynSubbandTree(TileIdx, c).resLvl;
- step = params_Renamed.nStep[0][0] * (1L << (rb[c] + sb.anGainExp + mrl - sb.level));
- }
- else
- {
- step = params_Renamed.nStep[sb.resLvl][sb.sbandIdx] * (1L << (rb[c] + sb.anGainExp));
- }
- shiftBits = 31 - magBits;
-
- // Adjust step to the number of shiftBits
- step /= (1 << shiftBits);
-
- switch (outdtype)
- {
-
- case DataBlk.TYPE_INT:
- // For int data Inverse quantization happens "in-place". The
- // input array has an offset of 0 and scan width equal to the
- // code-block width.
- for (j = outiarr.Length - 1; j >= 0; j--)
- {
- temp = outiarr[j]; // input array is same as output one
- //UPGRADE_WARNING: Data types in Visual C# might be different. Verify the accuracy of narrowing conversions. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1042'"
- outiarr[j] = (int)(((float)((temp >= 0) ? temp : -(temp & 0x7FFFFFFF))) * step);
- }
- break;
-
- case DataBlk.TYPE_FLOAT:
- // For float data the inverse quantization can not happen
- // "in-place".
- w = cblk.w;
- h = cblk.h;
- for (j = w * h - 1, k = inblk.offset + (h - 1) * inblk.scanw + w - 1, jmin = w * (h - 1); j >= 0; jmin -= w)
- {
- for (; j >= jmin; k--, j--)
- {
- temp = inarr[k];
- //UPGRADE_WARNING: Data types in Visual C# might be different. Verify the accuracy of narrowing conversions. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1042'"
- outfarr[j] = ((float)((temp >= 0) ? temp : -(temp & 0x7FFFFFFF))) * step;
- }
- // Jump to beggining of previous line in input
- k -= (inblk.scanw - w);
- }
- break;
- }
- }
- // Return the output code-block
- return cblk;
- }
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/quantization/dequantizer/StdDequantizerParams.cs b/CSJ2K/j2k/quantization/dequantizer/StdDequantizerParams.cs
deleted file mode 100644
index ec58235a..00000000
--- a/CSJ2K/j2k/quantization/dequantizer/StdDequantizerParams.cs
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
-* CVS identifier:
-*
-* $Id: StdDequantizerParams.java,v 1.9 2000/09/19 14:12:09 grosbois Exp $
-*
-* Class: StdDequantizerParams
-*
-* Description: Parameters for the scalar deadzone dequantizers
-*
-*
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-*/
-using CSJ2K.j2k.wavelet;
-namespace CSJ2K.j2k.quantization.dequantizer
-{
-
- /// This class holds the parameters for the scalar deadzone dequantizer
- /// (StdDequantizer class) for the current tile. Its constructor decodes the
- /// parameters from the main header and tile headers.
- ///
- ///
- ///
- ///
- ///
- public class StdDequantizerParams : DequantizerParams
- {
- /// Returns the type of the dequantizer for which the parameters are. The
- /// types are defined in the Dequantizer class.
- ///
- ///
- /// The type of the dequantizer for which the parameters
- /// are. Always Q_TYPE_SCALAR_DZ.
- ///
- ///
- ///
- ///
- ///
- override public int DequantizerType
- {
- get
- {
- return CSJ2K.j2k.quantization.QuantizationType_Fields.Q_TYPE_SCALAR_DZ;
- }
-
- }
-
- /// The quantization step "exponent" value, for each resolution level and
- /// subband, as it appears in the codestream. The first index is the
- /// resolution level, and the second the subband index (within the
- /// resolution level), as specified in the Subband class. When in derived
- /// quantization mode only the first resolution level (level 0) appears.
- ///
- /// For non-reversible systems this value corresponds to ceil(log2(D')),
- /// where D' is the quantization step size normalized to data of a dynamic
- /// range of 1. The true quantization step size is (2^R)*D', where R is
- /// ceil(log2(dr)), where 'dr' is the dynamic range of the subband samples,
- /// in the corresponding subband.
- ///
- ///
For reversible systems the exponent value in 'exp' is used to
- /// determine the number of magnitude bits in the quantized
- /// coefficients. It is, in fact, the dynamic range of the subband data.
- ///
- ///
In general the index of the first subband in a resolution level is
- /// not 0. The exponents appear, within each resolution level, at their
- /// subband index, and not in the subband order starting from 0. For
- /// instance, resolution level 3, the first subband has the index 16, then
- /// the exponent of the subband is exp[3][16], not exp[3][0].
- ///
- ///
- ///
- ///
- ///
- public int[][] exp;
-
- /// The quantization step for non-reversible systems, normalized to a
- /// dynamic range of 1, for each resolution level and subband, as derived
- /// from the exponent-mantissa representation in the codestream. The first
- /// index is the resolution level, and the second the subband index (within
- /// the resolution level), as specified in the Subband class. When in
- /// derived quantization mode only the first resolution level (level 0)
- /// appears.
- ///
- /// The true step size D is obtained as follows: D=(2^R)*D', where
- /// 'R=ceil(log2(dr))' and 'dr' is the dynamic range of the subband
- /// samples, in the corresponding subband.
- ///
- ///
This value is 'null' for reversible systems (i.e. there is no true
- /// quantization, 'D' is always 1).
- ///
- ///
In general the index of the first subband in a resolution level is
- /// not 0. The steps appear, within each resolution level, at their subband
- /// index, and not in the subband order starting from 0. For instance, if
- /// resolution level 3, the first subband has the index 16, then the step
- /// of the subband is nStep[3][16], not nStep[3][0].
- ///
- ///
- ///
- ///
- ///
- public float[][] nStep;
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/quantization/quantizer/CBlkQuantDataSrcEnc.cs b/CSJ2K/j2k/quantization/quantizer/CBlkQuantDataSrcEnc.cs
deleted file mode 100644
index dfffec2b..00000000
--- a/CSJ2K/j2k/quantization/quantizer/CBlkQuantDataSrcEnc.cs
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
-* CVS identifier:
-*
-* $Id: CBlkQuantDataSrcEnc.java,v 1.10 2001/09/14 08:51:46 grosbois Exp $
-*
-* Class: CBlkQuantDataSrcEnc
-*
-* Description: Interface that defines a source of
-* quantized wavelet data to be transferred in a
-* code-block by code-block basis.
-*
-*
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-* */
-using CSJ2K.j2k.entropy.encoder;
-using CSJ2K.j2k.wavelet.analysis;
-namespace CSJ2K.j2k.quantization.quantizer
-{
-
- /// This interface defines a source of quantized wavelet coefficients and
- /// methods to transfer them in a code-block by code-block basis. In each call
- /// to 'getNextCodeBlock()' or 'getNextInternCodeBlock()' a new code-block is
- /// returned. The code-blocks are returned in no specific order.
- ///
- /// This class is the source of data for the entropy coder. See the
- /// 'EntropyCoder' class.
- ///
- /// Code-block data is returned in sign-magnitude representation, instead of
- /// the normal two's complement one. Only integral types are used. The sign
- /// magnitude representation is more adequate for entropy coding. In sign
- /// magnitude representation, the most significant bit is used for the sign (0
- /// if positive, 1 if negative) and the magnitude of the coefficient is stored
- /// in the next M most significant bits. The rest of the bits (least
- /// significant bits) can contain a fractional value of the quantized
- /// coefficient. The number 'M' of magnitude bits is communicated in the
- /// 'magbits' member variable of the 'CBlkWTData'.
- ///
- /// Note that no more of one object may request data, otherwise one object
- /// would get some of the data and another one another part, in no defined
- /// manner.
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public interface CBlkQuantDataSrcEnc : ForwWTDataProps
- {
-
- /// Returns the next code-block in the current tile for the specified
- /// component, as a copy (see below). The order in which code-blocks are
- /// returned is not specified. However each code-block is returned only
- /// once and all code-blocks will be returned if the method is called 'N'
- /// times, where 'N' is the number of code-blocks in the tile. After all
- /// the code-blocks have been returned for the current tile calls to this
- /// method will return 'null'.
- ///
- /// When changing the current tile (through 'setTile()' or 'nextTile()')
- /// this method will always return the first code-block, as if this method
- /// was never called before for the new current tile.
- ///
- /// The data returned by this method is always a copy of the internal
- /// data of this object, if any, and it can be modified "in place" without
- /// any problems after being returned. The 'offset' of the returned data is
- /// 0, and the 'scanw' is the same as the code-block width. See the
- /// 'CBlkWTData' class.
- ///
- /// The 'ulx' and 'uly' members of the returned 'CBlkWTData' object
- /// contain the coordinates of the top-left corner of the block, with
- /// respect to the tile, not the subband.
- ///
- ///
- /// The component for which to return the next code-block.
- ///
- ///
- /// If non-null this object will be used to return the new
- /// code-block. If null a new one will be allocated and returned. If the
- /// "data" array of the object is non-null it will be reused, if possible,
- /// to return the data.
- ///
- ///
- /// The next code-block in the current tile for component 'c', or
- /// null if all code-blocks for the current tile have been returned.
- ///
- ///
- ///
- ///
- ///
- CBlkWTData getNextCodeBlock(int c, CBlkWTData cblk);
-
- /// Returns the next code-block in the current tile for the specified
- /// component. The order in which code-blocks are returned is not
- /// specified. However each code-block is returned only once and all
- /// code-blocks will be returned if the method is called 'N' times, where
- /// 'N' is the number of code-blocks in the tile. After all the code-blocks
- /// have been returned for the current tile calls to this method will
- /// return 'null'.
- ///
- /// When changing the current tile (through 'setTile()' or 'nextTile()')
- /// this method will always return the first code-block, as if this method
- /// was never called before for the new current tile.
- ///
- /// The data returned by this method can be the data in the internal
- /// buffer of this object, if any, and thus can not be modified by the
- /// caller. The 'offset' and 'scanw' of the returned data can be
- /// arbitrary. See the 'CBlkWTData' class.
- ///
- /// The 'ulx' and 'uly' members of the returned 'CBlkWTData' object
- /// contain the coordinates of the top-left corner of the block, with
- /// respect to the tile, not the subband.
- ///
- ///
- /// The component for which to return the next code-block.
- ///
- ///
- /// If non-null this object will be used to return the new
- /// code-block. If null a new one will be allocated and returned. If the
- /// "data" array of the object is non-null it will be reused, if possible,
- /// to return the data.
- ///
- ///
- /// The next code-block in the current tile for component 'n', or
- /// null if all code-blocks for the current tile have been returned.
- ///
- ///
- ///
- ///
- ///
- CBlkWTData getNextInternCodeBlock(int c, CBlkWTData cblk);
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/quantization/quantizer/Quantizer.cs b/CSJ2K/j2k/quantization/quantizer/Quantizer.cs
deleted file mode 100644
index 1c361725..00000000
--- a/CSJ2K/j2k/quantization/quantizer/Quantizer.cs
+++ /dev/null
@@ -1,288 +0,0 @@
-/*
-* CVS identifier:
-*
-* $Id: Quantizer.java,v 1.38 2002/01/09 13:24:14 grosbois Exp $
-*
-* Class: Quantizer
-*
-* Description: An abstract class for quantizers
-*
-*
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-* */
-using CSJ2K.j2k.encoder;
-using CSJ2K.j2k.image;
-using CSJ2K.j2k.wavelet;
-using CSJ2K.j2k.wavelet.analysis;
-namespace CSJ2K.j2k.quantization.quantizer
-{
-
- /// This abstract class provides the general interface for quantizers. The
- /// input of a quantizer is the output of a wavelet transform. The output of
- /// the quantizer is the set of quantized wavelet coefficients represented in
- /// sign-magnitude notation (see below).
- ///
- /// This class provides default implementation for most of the methods
- /// (wherever it makes sense), under the assumption that the image, component
- /// dimensions, and the tiles, are not modifed by the quantizer. If it is not
- /// the case for a particular implementation, then the methods should be
- /// overriden.
- ///
- /// Sign magnitude representation is used (instead of two's complement) for
- /// the output data. The most significant bit is used for the sign (0 if
- /// positive, 1 if negative). Then the magnitude of the quantized coefficient
- /// is stored in the next M most significat bits. The rest of the bits (least
- /// significant bits) can contain a fractional value of the quantized
- /// coefficient. This fractional value is not to be coded by the entropy
- /// coder. However, it can be used to compute rate-distortion measures with
- /// greater precision.
- ///
- /// The value of M is determined for each subband as the sum of the number
- /// of guard bits G and the nominal range of quantized wavelet coefficients in
- /// the corresponding subband (Rq), minus 1:
- ///
- /// M = G + Rq -1
- ///
- /// The value of G should be the same for all subbands. The value of Rq
- /// depends on the quantization step size, the nominal range of the component
- /// before the wavelet transform and the analysis gain of the subband (see
- /// Subband).
- ///
- /// The blocks of data that are requested should not cross subband
- /// boundaries.
- ///
- /// NOTE: At the moment only quantizers that implement the
- /// 'CBlkQuantDataSrcEnc' interface are supported.
- ///
- ///
- ///
- ///
- ///
- public abstract class Quantizer : ImgDataAdapter, CBlkQuantDataSrcEnc
- {
- /// Returns the horizontal offset of the code-block partition. Allowable
- /// values are 0 and 1, nothing else.
- ///
- ///
- virtual public int CbULX
- {
- get
- {
- return src.CbULX;
- }
-
- }
- /// Returns the vertical offset of the code-block partition. Allowable
- /// values are 0 and 1, nothing else.
- ///
- ///
- virtual public int CbULY
- {
- get
- {
- return src.CbULY;
- }
-
- }
- /// Returns the parameters that are used in this class and implementing
- /// classes. It returns a 2D String array. Each of the 1D arrays is for a
- /// different option, and they have 3 elements. The first element is the
- /// option name, the second one is the synopsis, the third one is a long
- /// description of what the parameter is and the fourth is its default
- /// value. The synopsis or description may be 'null', in which case it is
- /// assumed that there is no synopsis or description of the option,
- /// respectively. Null may be returned if no options are supported.
- ///
- ///
- /// the options name, their synopsis and their explanation,
- /// or null if no options are supported.
- ///
- ///
- public static System.String[][] ParameterInfo
- {
- get
- {
- return pinfo;
- }
-
- }
-
- /// The prefix for quantizer options: 'Q'
- public const char OPT_PREFIX = 'Q';
-
- /// The list of parameters that is accepted for quantization. Options
- /// for quantization start with 'Q'.
- ///
- //UPGRADE_NOTE: Final was removed from the declaration of 'pinfo'. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private static readonly System.String[][] pinfo = new System.String[][] { new System.String[] { "Qtype", "[] " + "[ [] ...]", "Specifies which quantization type to use for specified " + "tile-component. The default type is either 'reversible' or " + "'expounded' depending on whether or not the '-lossless' option " + " is specified.\n" + " : see general note.\n" + ": Supported quantization types specification are : " + "'reversible' " + "(no quantization), 'derived' (derived quantization step size) and " + "'expounded'.\n" + "Example: -Qtype reversible or -Qtype t2,4-8 c2 reversible t9 " + "derived.", null }, new System.String[] { "Qstep", "[] " + "[ [] ...]", "This option specifies the base normalized quantization step " + "size (bnss) for tile-components. It is normalized to a " + "dynamic range of 1 in the image domain. This parameter is " + "ignored in reversible coding. The default value is '1/128'" + " (i.e. 0.0078125).", "0.0078125" }, new System.String[] { "Qguard_bits", "[] " + "[ [] ...]", "The number of bits used for each tile-component in the quantizer" + " to avoid overflow (gb).", "2" } };
-
- /// The source of wavelet transform coefficients
- protected internal CBlkWTDataSrc src;
-
- /// Initializes the source of wavelet transform coefficients.
- ///
- ///
- /// The source of wavelet transform coefficients.
- ///
- ///
- public Quantizer(CBlkWTDataSrc src) : base(src)
- {
- this.src = src;
- }
-
- /// Returns the number of guard bits used by this quantizer in the
- /// given tile-component.
- ///
- ///
- /// Tile index
- ///
- ///
- /// Component index
- ///
- ///
- /// The number of guard bits
- ///
- ///
- public abstract int getNumGuardBits(int t, int c);
-
- /// Returns true if the quantizer of given tile-component uses derived
- /// quantization step sizes.
- ///
- ///
- /// Tile index
- ///
- ///
- /// Component index
- ///
- ///
- /// True if derived quantization is used.
- ///
- ///
- public abstract bool isDerived(int t, int c);
-
- /// Calculates the parameters of the SubbandAn objects that depend on the
- /// Quantizer. The 'stepWMSE' field is calculated for each subband which is
- /// a leaf in the tree rooted at 'sb', for the specified component. The
- /// subband tree 'sb' must be the one for the component 'n'.
- ///
- ///
- /// The root of the subband tree.
- ///
- ///
- /// The component index.
- ///
- ///
- ///
- ///
- ///
- protected internal abstract void calcSbParams(SubbandAn sb, int n);
-
- /// Returns a reference to the subband tree structure representing the
- /// subband decomposition for the specified tile-component.
- ///
- /// This method gets the subband tree from the source and then
- /// calculates the magnitude bits for each leaf using the method
- /// calcSbParams().
- ///
- ///
- /// The index of the tile.
- ///
- ///
- /// The index of the component.
- ///
- ///
- /// The subband tree structure, see SubbandAn.
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public virtual SubbandAn getAnSubbandTree(int t, int c)
- {
- SubbandAn sbba;
-
- // Ask for the wavelet tree of the source
- sbba = src.getAnSubbandTree(t, c);
- // Calculate the stepWMSE
- calcSbParams(sbba, c);
- return sbba;
- }
-
- /// Creates a Quantizer object for the appropriate type of quantization
- /// specified in the options in the parameter list 'pl', and having 'src'
- /// as the source of data to be quantized. The 'rev' flag indicates if the
- /// quantization should be reversible.
- ///
- /// NOTE: At the moment only sources of wavelet data that implement the
- /// 'CBlkWTDataSrc' interface are supported.
- ///
- ///
- /// The source of data to be quantized
- ///
- ///
- /// Encoder specifications
- ///
- ///
- /// If an error occurs while parsing
- /// the options in 'pl'
- ///
- ///
- public static Quantizer createInstance(CBlkWTDataSrc src, EncoderSpecs encSpec)
- {
- // Instantiate quantizer
- return new StdQuantizer(src, encSpec);
- }
-
- /// Returns the maximum number of magnitude bits in any subband in the
- /// current tile.
- ///
- ///
- /// the component number
- ///
- ///
- /// The maximum number of magnitude bits in all subbands of the
- /// current tile.
- ///
- ///
- public abstract int getMaxMagBits(int c);
- public abstract CSJ2K.j2k.wavelet.analysis.CBlkWTData getNextInternCodeBlock(int param1, CSJ2K.j2k.wavelet.analysis.CBlkWTData param2);
- public abstract CSJ2K.j2k.wavelet.analysis.CBlkWTData getNextCodeBlock(int param1, CSJ2K.j2k.wavelet.analysis.CBlkWTData param2);
- public abstract bool isReversible(int param1, int param2);
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/quantization/quantizer/StdQuantizer.cs b/CSJ2K/j2k/quantization/quantizer/StdQuantizer.cs
deleted file mode 100644
index 8a0a8c2a..00000000
--- a/CSJ2K/j2k/quantization/quantizer/StdQuantizer.cs
+++ /dev/null
@@ -1,725 +0,0 @@
-/*
-* CVS identifier:
-*
-* $Id: StdQuantizer.java,v 1.14 2001/09/20 12:41:52 grosbois Exp $
-*
-* Class: StdQuantizer
-*
-* Description: Scalar deadzone quantizer of integer or float
-* data.
-*
-* Mergerd from StdQuantizerInt and
-* StdQuantizerFloat from Joel Askelof.
-*
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-* */
-using CSJ2K.j2k.encoder;
-using CSJ2K.j2k.image;
-using CSJ2K.j2k.wavelet;
-using CSJ2K.j2k.wavelet.analysis;
-namespace CSJ2K.j2k.quantization.quantizer
-{
-
- /// This class implements scalar quantization of integer or floating-point
- /// valued source data. The source data is the wavelet transformed image data
- /// and the output is the quantized wavelet coefficients represented in
- /// sign-magnitude (see below).
- ///
- /// Sign magnitude representation is used (instead of two's complement) for
- /// the output data. The most significant bit is used for the sign (0 if
- /// positive, 1 if negative). Then the magnitude of the quantized coefficient
- /// is stored in the next M most significat bits. The rest of the bits (least
- /// significant bits) can contain a fractional value of the quantized
- /// coefficient. This fractional value is not to be coded by the entropy
- /// coder. However, it can be used to compute rate-distortion measures with
- /// greater precision.
- ///
- /// The value of M is determined for each subband as the sum of the number
- /// of guard bits G and the nominal range of quantized wavelet coefficients in
- /// the corresponding subband (Rq), minus 1:
- ///
- /// M = G + Rq -1
- ///
- /// The value of G should be the same for all subbands. The value of Rq
- /// depends on the quantization step size, the nominal range of the component
- /// before the wavelet transform and the analysis gain of the subband (see
- /// Subband).
- ///
- /// The blocks of data that are requested should not cross subband
- /// boundaries.
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public class StdQuantizer : Quantizer
- {
- /// Returns the quantization type spec object associated to the quantizer.
- ///
- ///
- /// The quantization type spec
- ///
- ///
- virtual public QuantTypeSpec QuantTypeSpec
- {
- get
- {
- return qts;
- }
-
- }
-
- /// The number of mantissa bits for the quantization steps
- public const int QSTEP_MANTISSA_BITS = 11;
-
- /// The number of exponent bits for the quantization steps
- // NOTE: formulas in 'convertFromExpMantissa()' and
- // 'convertToExpMantissa()' methods do not support more than 5 bits.
- public const int QSTEP_EXPONENT_BITS = 5;
-
- /// The maximum value of the mantissa for the quantization steps
- //UPGRADE_NOTE: Final was removed from the declaration of 'QSTEP_MAX_MANTISSA '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- public static readonly int QSTEP_MAX_MANTISSA = (1 << QSTEP_MANTISSA_BITS) - 1;
-
- /// The maximum value of the exponent for the quantization steps
- //UPGRADE_NOTE: Final was removed from the declaration of 'QSTEP_MAX_EXPONENT '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- public static readonly int QSTEP_MAX_EXPONENT = (1 << QSTEP_EXPONENT_BITS) - 1;
-
- /// Natural log of 2, used as a convenience variable
- private static double log2 = System.Math.Log(2);
-
- /// The quantization type specifications
- private QuantTypeSpec qts;
-
- /// The quantization step size specifications
- private QuantStepSizeSpec qsss;
-
- /// The guard bits specifications
- private GuardBitsSpec gbs;
-
- /// The 'CBlkWTDataFloat' object used to request data, used when
- /// quantizing floating-point data.
- ///
- // This variable makes the class thread unsafe, but it avoids allocating
- // new objects for code-block that is quantized.
- private CBlkWTDataFloat infblk;
-
- /// Initializes the source of wavelet transform coefficients. The
- /// constructor takes information on whether the quantizer is in
- /// reversible, derived or expounded mode. If the quantizer is reversible
- /// the value of 'derived' is ignored. If the source data is not integer
- /// (int) then the quantizer can not be reversible.
- ///
- /// After initializing member attributes, getAnSubbandTree is called for
- /// all components setting the 'stepWMSE' for all subbands in the current
- /// tile.
- ///
- ///
- /// The source of wavelet transform coefficients.
- ///
- ///
- /// The encoder specifications
- ///
- ///
- public StdQuantizer(CBlkWTDataSrc src, EncoderSpecs encSpec) : base(src)
- {
- qts = encSpec.qts;
- qsss = encSpec.qsss;
- gbs = encSpec.gbs;
- }
-
- /// Returns the number of guard bits used by this quantizer in the given
- /// tile-component.
- ///
- ///
- /// Tile index
- ///
- ///
- /// Component index
- ///
- ///
- /// The number of guard bits
- ///
- ///
- public override int getNumGuardBits(int t, int c)
- {
- return ((System.Int32)gbs.getTileCompVal(t, c));
- }
-
- /// Returns true if the quantized data is reversible, for the specified
- /// tile-component. For the quantized data to be reversible it is necessary
- /// and sufficient that the quantization is reversible.
- ///
- ///
- /// The tile to test for reversibility
- ///
- ///
- /// The component to test for reversibility
- ///
- ///
- /// True if the quantized data is reversible, false if not.
- ///
- ///
- public override bool isReversible(int t, int c)
- {
- return qts.isReversible(t, c);
- }
-
- /// Returns true if given tile-component uses derived quantization step
- /// sizes.
- ///
- ///
- /// Tile index
- ///
- ///
- /// Component index
- ///
- ///
- /// True if derived
- ///
- ///
- public override bool isDerived(int t, int c)
- {
- return qts.isDerived(t, c);
- }
-
- /// Returns the next code-block in the current tile for the specified
- /// component, as a copy (see below). The order in which code-blocks are
- /// returned is not specified. However each code-block is returned only
- /// once and all code-blocks will be returned if the method is called 'N'
- /// times, where 'N' is the number of code-blocks in the tile. After all
- /// the code-blocks have been returned for the current tile calls to this
- /// method will return 'null'.
- ///
- /// When changing the current tile (through 'setTile()' or 'nextTile()')
- /// this method will always return the first code-block, as if this method
- /// was never called before for the new current tile.
- ///
- /// The data returned by this method is always a copy of the
- /// data. Therfore it can be modified "in place" without any problems after
- /// being returned. The 'offset' of the returned data is 0, and the 'scanw'
- /// is the same as the code-block width. See the 'CBlkWTData' class.
- ///
- /// The 'ulx' and 'uly' members of the returned 'CBlkWTData' object
- /// contain the coordinates of the top-left corner of the block, with
- /// respect to the tile, not the subband.
- ///
- ///
- /// The component for which to return the next code-block.
- ///
- ///
- /// If non-null this object will be used to return the new
- /// code-block. If null a new one will be allocated and returned. If the
- /// "data" array of the object is non-null it will be reused, if possible,
- /// to return the data.
- ///
- ///
- /// The next code-block in the current tile for component 'n', or
- /// null if all code-blocks for the current tile have been returned.
- ///
- ///
- ///
- ///
- ///
- public override CBlkWTData getNextCodeBlock(int c, CBlkWTData cblk)
- {
- return getNextInternCodeBlock(c, cblk);
- }
-
- /// Returns the next code-block in the current tile for the specified
- /// component. The order in which code-blocks are returned is not
- /// specified. However each code-block is returned only once and all
- /// code-blocks will be returned if the method is called 'N' times, where
- /// 'N' is the number of code-blocks in the tile. After all the code-blocks
- /// have been returned for the current tile calls to this method will
- /// return 'null'.
- ///
- /// When changing the current tile (through 'setTile()' or 'nextTile()')
- /// this method will always return the first code-block, as if this method
- /// was never called before for the new current tile.
- ///
- /// The data returned by this method can be the data in the internal
- /// buffer of this object, if any, and thus can not be modified by the
- /// caller. The 'offset' and 'scanw' of the returned data can be
- /// arbitrary. See the 'CBlkWTData' class.
- ///
- /// The 'ulx' and 'uly' members of the returned 'CBlkWTData' object
- /// contain the coordinates of the top-left corner of the block, with
- /// respect to the tile, not the subband.
- ///
- ///
- /// The component for which to return the next code-block.
- ///
- ///
- /// If non-null this object will be used to return the new
- /// code-block. If null a new one will be allocated and returned. If the
- /// "data" array of the object is non-null it will be reused, if possible,
- /// to return the data.
- ///
- ///
- /// The next code-block in the current tile for component 'n', or
- /// null if all code-blocks for the current tile have been returned.
- ///
- ///
- ///
- ///
- ///
- public override CBlkWTData getNextInternCodeBlock(int c, CBlkWTData cblk)
- {
- // NOTE: this method is declared final since getNextCodeBlock() relies
- // on this particular implementation
- int k, j;
- int tmp, shiftBits, jmin;
- int w, h;
- int[] outarr;
- float[] infarr = null;
- CBlkWTDataFloat infblk;
- float invstep; // The inverse of the quantization step size
- bool intq; // flag for quantizig ints
- SubbandAn sb;
- float stepUDR; // The quantization step size (for a dynamic
- // range of 1, or unit)
- int g = ((System.Int32)gbs.getTileCompVal(tIdx, c));
-
- // Are we quantizing ints or floats?
- intq = (src.getDataType(tIdx, c) == DataBlk.TYPE_INT);
-
- // Check that we have an output object
- if (cblk == null)
- {
- cblk = new CBlkWTDataInt();
- }
-
- // Cache input float code-block
- infblk = this.infblk;
-
- // Get data to quantize. When quantizing int data 'cblk' is used to
- // get the data to quantize and to return the quantized data as well,
- // that's why 'getNextCodeBlock()' is used. This can not be done when
- // quantizing float data because of the different data types, that's
- // why 'getNextInternCodeBlock()' is used in that case.
- if (intq)
- {
- // Source data is int
- cblk = src.getNextCodeBlock(c, cblk);
- if (cblk == null)
- {
- return null; // No more code-blocks in current tile for comp.
- }
- // Input and output arrays are the same (for "in place" quant.)
- outarr = (int[])cblk.Data;
- }
- else
- {
- // Source data is float
- // Can not use 'cblk' to get float data, use 'infblk'
- infblk = (CBlkWTDataFloat)src.getNextInternCodeBlock(c, infblk);
- if (infblk == null)
- {
- // Release buffer from infblk: this enables to garbage collect
- // the big buffer when we are done with last code-block of
- // component.
- this.infblk.Data = null;
- return null; // No more code-blocks in current tile for comp.
- }
- this.infblk = infblk; // Save local cache
- infarr = (float[])infblk.Data;
- // Get output data array and check that there is memory to put the
- // quantized coeffs in
- outarr = (int[])cblk.Data;
- if (outarr == null || outarr.Length < infblk.w * infblk.h)
- {
- outarr = new int[infblk.w * infblk.h];
- cblk.Data = outarr;
- }
- cblk.m = infblk.m;
- cblk.n = infblk.n;
- cblk.sb = infblk.sb;
- cblk.ulx = infblk.ulx;
- cblk.uly = infblk.uly;
- cblk.w = infblk.w;
- cblk.h = infblk.h;
- cblk.wmseScaling = infblk.wmseScaling;
- cblk.offset = 0;
- cblk.scanw = cblk.w;
- }
-
- // Cache width, height and subband of code-block
- w = cblk.w;
- h = cblk.h;
- sb = cblk.sb;
-
- if (isReversible(tIdx, c))
- {
- // Reversible only for int data
- cblk.magbits = g - 1 + src.getNomRangeBits(c) + sb.anGainExp;
- shiftBits = 31 - cblk.magbits;
-
- // Update the convertFactor field
- cblk.convertFactor = (1 << shiftBits);
-
- // Since we used getNextCodeBlock() to get the int data then
- // 'offset' is 0 and 'scanw' is the width of the code-block The
- // input and output arrays are the same (i.e. "in place")
- for (j = w * h - 1; j >= 0; j--)
- {
- tmp = (outarr[j] << shiftBits);
- outarr[j] = ((tmp < 0) ? (1 << 31) | (-tmp) : tmp);
- }
- }
- else
- {
- // Non-reversible, use step size
- //UPGRADE_TODO: The equivalent in .NET for method 'java.lang.Float.floatValue' may return a different value. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1043'"
- float baseStep = (float)((System.Single)qsss.getTileCompVal(tIdx, c));
-
- // Calculate magnitude bits and quantization step size
- if (isDerived(tIdx, c))
- {
- //UPGRADE_WARNING: Data types in Visual C# might be different. Verify the accuracy of narrowing conversions. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1042'"
- cblk.magbits = g - 1 + sb.level - (int)System.Math.Floor(System.Math.Log(baseStep) / log2);
- stepUDR = baseStep / (1 << sb.level);
- }
- else
- {
- //UPGRADE_WARNING: Data types in Visual C# might be different. Verify the accuracy of narrowing conversions. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1042'"
- cblk.magbits = g - 1 - (int)System.Math.Floor(System.Math.Log(baseStep / (sb.l2Norm * (1 << sb.anGainExp))) / log2);
- stepUDR = baseStep / (sb.l2Norm * (1 << sb.anGainExp));
- }
- shiftBits = 31 - cblk.magbits;
- // Calculate step that decoder will get and use that one.
- stepUDR = convertFromExpMantissa(convertToExpMantissa(stepUDR));
- invstep = 1.0f / ((1L << (src.getNomRangeBits(c) + sb.anGainExp)) * stepUDR);
- // Normalize to magnitude bits (output fractional point)
- invstep *= (1 << (shiftBits - src.getFixedPoint(c)));
-
- // Update convertFactor and stepSize fields
- cblk.convertFactor = invstep;
- cblk.stepSize = ((1L << (src.getNomRangeBits(c) + sb.anGainExp)) * stepUDR);
-
- if (intq)
- {
- // Quantizing int data
- // Since we used getNextCodeBlock() to get the int data then
- // 'offset' is 0 and 'scanw' is the width of the code-block
- // The input and output arrays are the same (i.e. "in place")
- for (j = w * h - 1; j >= 0; j--)
- {
- //UPGRADE_WARNING: Data types in Visual C# might be different. Verify the accuracy of narrowing conversions. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1042'"
- tmp = (int)(outarr[j] * invstep);
- outarr[j] = ((tmp < 0) ? (1 << 31) | (-tmp) : tmp);
- }
- }
- else
- {
- // Quantizing float data
- for (j = w * h - 1, k = infblk.offset + (h - 1) * infblk.scanw + w - 1, jmin = w * (h - 1); j >= 0; jmin -= w)
- {
- for (; j >= jmin; k--, j--)
- {
- //UPGRADE_WARNING: Data types in Visual C# might be different. Verify the accuracy of narrowing conversions. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1042'"
- tmp = (int)(infarr[k] * invstep);
- outarr[j] = ((tmp < 0) ? (1 << 31) | (-tmp) : tmp);
- }
- // Jump to beggining of previous line in input
- k -= (infblk.scanw - w);
- }
- }
- }
- // Return the quantized code-block
- return cblk;
- }
-
- /// Calculates the parameters of the SubbandAn objects that depend on the
- /// Quantizer. The 'stepWMSE' field is calculated for each subband which is
- /// a leaf in the tree rooted at 'sb', for the specified component. The
- /// subband tree 'sb' must be the one for the component 'n'.
- ///
- ///
- /// The root of the subband tree.
- ///
- ///
- /// The component index
- ///
- ///
- ///
- ///
- ///
- protected internal override void calcSbParams(SubbandAn sb, int c)
- {
- float baseStep;
-
- if (sb.stepWMSE > 0f)
- // parameters already calculated
- return;
- if (!sb.isNode)
- {
- if (isReversible(tIdx, c))
- {
- //UPGRADE_WARNING: Data types in Visual C# might be different. Verify the accuracy of narrowing conversions. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1042'"
- sb.stepWMSE = (float)System.Math.Pow(2, -(src.getNomRangeBits(c) << 1)) * sb.l2Norm * sb.l2Norm;
- }
- else
- {
- //UPGRADE_TODO: The equivalent in .NET for method 'java.lang.Float.floatValue' may return a different value. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1043'"
- baseStep = (float)((System.Single)qsss.getTileCompVal(tIdx, c));
- if (isDerived(tIdx, c))
- {
- //UPGRADE_WARNING: Data types in Visual C# might be different. Verify the accuracy of narrowing conversions. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1042'"
- sb.stepWMSE = baseStep * baseStep * (float)System.Math.Pow(2, (sb.anGainExp - sb.level) << 1) * sb.l2Norm * sb.l2Norm;
- }
- else
- {
- sb.stepWMSE = baseStep * baseStep;
- }
- }
- }
- else
- {
- calcSbParams((SubbandAn)sb.LL, c);
- calcSbParams((SubbandAn)sb.HL, c);
- calcSbParams((SubbandAn)sb.LH, c);
- calcSbParams((SubbandAn)sb.HH, c);
- sb.stepWMSE = 1f; // Signal that we already calculated this branch
- }
- }
-
- /// Converts the floating point value to its exponent-mantissa
- /// representation. The mantissa occupies the 11 least significant bits
- /// (bits 10-0), and the exponent the previous 5 bits (bits 15-11).
- ///
- ///
- /// The quantization step, normalized to a dynamic range of 1.
- ///
- ///
- /// The exponent mantissa representation of the step.
- ///
- ///
- public static int convertToExpMantissa(float step)
- {
- int exp;
-
- //UPGRADE_WARNING: Data types in Visual C# might be different. Verify the accuracy of narrowing conversions. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1042'"
- exp = (int)System.Math.Ceiling((-System.Math.Log(step)) / log2);
- if (exp > QSTEP_MAX_EXPONENT)
- {
- // If step size is too small for exponent representation, use the
- // minimum, which is exponent QSTEP_MAX_EXPONENT and mantissa 0.
- return (QSTEP_MAX_EXPONENT << QSTEP_MANTISSA_BITS);
- }
- // NOTE: this formula does not support more than 5 bits for the
- // exponent, otherwise (-1< Converts the exponent-mantissa representation to its floating-point
- /// value. The mantissa occupies the 11 least significant bits (bits 10-0),
- /// and the exponent the previous 5 bits (bits 15-11).
- ///
- ///
- /// The exponent-mantissa representation of the step.
- ///
- ///
- /// The floating point representation of the step, normalized to a
- /// dynamic range of 1.
- ///
- ///
- private static float convertFromExpMantissa(int ems)
- {
- // NOTE: this formula does not support more than 5 bits for the
- // exponent, otherwise (-1<> QSTEP_MANTISSA_BITS) & QSTEP_MAX_EXPONENT));
- }
-
- /// Returns the maximum number of magnitude bits in any subband of the
- /// current tile.
- ///
- ///
- /// the component number
- ///
- ///
- /// The maximum number of magnitude bits in all subbands of the
- /// current tile.
- ///
- ///
- public override int getMaxMagBits(int c)
- {
- Subband sb = getAnSubbandTree(tIdx, c);
- if (isReversible(tIdx, c))
- {
- return getMaxMagBitsRev(sb, c);
- }
- else
- {
- if (isDerived(tIdx, c))
- {
- return getMaxMagBitsDerived(sb, tIdx, c);
- }
- else
- {
- return getMaxMagBitsExpounded(sb, tIdx, c);
- }
- }
- }
-
-
- /// Returns the maximum number of magnitude bits in any subband of the
- /// current tile if reversible quantization is used
- ///
- ///
- /// The root of the subband tree of the current tile
- ///
- ///
- /// the component number
- ///
- ///
- /// The highest number of magnitude bit-planes
- ///
- ///
- private int getMaxMagBitsRev(Subband sb, int c)
- {
- int tmp, max = 0;
- int g = ((System.Int32)gbs.getTileCompVal(tIdx, c));
-
- if (!sb.isNode)
- return g - 1 + src.getNomRangeBits(c) + sb.anGainExp;
-
- max = getMaxMagBitsRev(sb.LL, c);
- tmp = getMaxMagBitsRev(sb.LH, c);
- if (tmp > max)
- max = tmp;
- tmp = getMaxMagBitsRev(sb.HL, c);
- if (tmp > max)
- max = tmp;
- tmp = getMaxMagBitsRev(sb.HH, c);
- if (tmp > max)
- max = tmp;
-
- return max;
- }
-
- /// Returns the maximum number of magnitude bits in any subband in the
- /// given tile-component if derived quantization is used
- ///
- ///
- /// The root of the subband tree of the tile-component
- ///
- ///
- /// Tile index
- ///
- ///
- /// Component index
- ///
- ///
- /// The highest number of magnitude bit-planes
- ///
- ///
- private int getMaxMagBitsDerived(Subband sb, int t, int c)
- {
- int tmp, max = 0;
- int g = ((System.Int32)gbs.getTileCompVal(t, c));
-
- if (!sb.isNode)
- {
- //UPGRADE_TODO: The equivalent in .NET for method 'java.lang.Float.floatValue' may return a different value. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1043'"
- float baseStep = (float)((System.Single)qsss.getTileCompVal(t, c));
- //UPGRADE_WARNING: Data types in Visual C# might be different. Verify the accuracy of narrowing conversions. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1042'"
- return g - 1 + sb.level - (int)System.Math.Floor(System.Math.Log(baseStep) / log2);
- }
-
- max = getMaxMagBitsDerived(sb.LL, t, c);
- tmp = getMaxMagBitsDerived(sb.LH, t, c);
- if (tmp > max)
- max = tmp;
- tmp = getMaxMagBitsDerived(sb.HL, t, c);
- if (tmp > max)
- max = tmp;
- tmp = getMaxMagBitsDerived(sb.HH, t, c);
- if (tmp > max)
- max = tmp;
-
- return max;
- }
-
-
- /// Returns the maximum number of magnitude bits in any subband in the
- /// given tile-component if expounded quantization is used
- ///
- ///
- /// The root of the subband tree of the tile-component
- ///
- ///
- /// Tile index
- ///
- ///
- /// Component index
- ///
- ///
- /// The highest number of magnitude bit-planes
- ///
- ///
- private int getMaxMagBitsExpounded(Subband sb, int t, int c)
- {
- int tmp, max = 0;
- int g = ((System.Int32)gbs.getTileCompVal(t, c));
-
- if (!sb.isNode)
- {
- //UPGRADE_TODO: The equivalent in .NET for method 'java.lang.Float.floatValue' may return a different value. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1043'"
- float baseStep = (float)((System.Single)qsss.getTileCompVal(t, c));
- //UPGRADE_WARNING: Data types in Visual C# might be different. Verify the accuracy of narrowing conversions. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1042'"
- return g - 1 - (int)System.Math.Floor(System.Math.Log(baseStep / (((SubbandAn)sb).l2Norm * (1 << sb.anGainExp))) / log2);
- }
-
- max = getMaxMagBitsExpounded(sb.LL, t, c);
- tmp = getMaxMagBitsExpounded(sb.LH, t, c);
- if (tmp > max)
- max = tmp;
- tmp = getMaxMagBitsExpounded(sb.HL, t, c);
- if (tmp > max)
- max = tmp;
- tmp = getMaxMagBitsExpounded(sb.HH, t, c);
- if (tmp > max)
- max = tmp;
-
- return max;
- }
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/roi/MaxShiftSpec.cs b/CSJ2K/j2k/roi/MaxShiftSpec.cs
deleted file mode 100644
index 0f4ba01a..00000000
--- a/CSJ2K/j2k/roi/MaxShiftSpec.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
-* CVS identifier:
-*
-* $Id: MaxShiftSpec.java,v 1.10 2000/11/27 15:00:45 grosbois Exp $
-*
-* Class: MaxShiftSpec
-*
-* Description: Generic class for storing module specs
-*
-*
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-*/
-namespace CSJ2K.j2k.roi
-{
-
- /// This class contains the maxshift scaling value for each tile-component.
- /// The scaling values used are calculated in the ROIScaler class
- ///
- ///
-
- public class MaxShiftSpec : ModuleSpec
- {
-
- /// Constructs a 'ModuleSpec' object, initializing all the components and
- /// tiles to the 'SPEC_DEF' spec type, for the specified number of
- /// components and tiles.
- ///
- ///
- /// The number of tiles
- ///
- ///
- /// The number of components
- ///
- ///
- /// the type of the specification module i.e. tile specific,
- /// component specific or both.
- ///
- ///
- public MaxShiftSpec(int nt, int nc, byte type) : base(nt, nc, type)
- {
- }
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/roi/ROIDeScaler.cs b/CSJ2K/j2k/roi/ROIDeScaler.cs
deleted file mode 100644
index 38bdd1cf..00000000
--- a/CSJ2K/j2k/roi/ROIDeScaler.cs
+++ /dev/null
@@ -1,375 +0,0 @@
-/*
-* CVS identifier:
-*
-* $Id: ROIDeScaler.java,v 1.39 2001/10/24 12:02:51 grosbois Exp $
-*
-*
-* Class: ROIDeScaler
-*
-* Description: The class taking care of de-scaling ROI coeffs.
-*
-*
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-* */
-using CSJ2K.j2k.decoder;
-using CSJ2K.j2k.image;
-using CSJ2K.j2k.quantization.dequantizer;
-using CSJ2K.j2k.util;
-using CSJ2K.j2k.wavelet.synthesis;
-namespace CSJ2K.j2k.roi
-{
-
- /// This class takes care of the de-scaling of ROI coefficients. The de-scaler
- /// works on a tile basis and any mask that is generated is for the current
- /// mask only
- ///
- /// Default implementations of the methods in 'MultiResImgData' are provided
- /// through the 'MultiResImgDataAdapter' abstract class.
- ///
- /// Sign-magnitude representation is used (instead of two's complement) for
- /// the output data. The most significant bit is used for the sign (0 if
- /// positive, 1 if negative). Then the magnitude of the quantized coefficient
- /// is stored in the next most significat bits. The most significant magnitude
- /// bit corresponds to the most significant bit-plane and so on.
- ///
- ///
- public class ROIDeScaler : MultiResImgDataAdapter, CBlkQuantDataSrcDec
- {
- /// Returns the horizontal code-block partition origin. Allowable values
- /// are 0 and 1, nothing else.
- ///
- ///
- virtual public int CbULX
- {
- get
- {
- return src.CbULX;
- }
-
- }
- /// Returns the vertical code-block partition origin. Allowable values are
- /// 0 and 1, nothing else.
- ///
- ///
- virtual public int CbULY
- {
- get
- {
- return src.CbULY;
- }
-
- }
- /// Returns the parameters that are used in this class and implementing
- /// classes. It returns a 2D String array. Each of the 1D arrays is for a
- /// different option, and they have 3 elements. The first element is the
- /// option name, the second one is the synopsis and the third one is a long
- /// description of what the parameter is. The synopsis or description may
- /// be 'null', in which case it is assumed that there is no synopsis or
- /// description of the option, respectively. Null may be returned if no
- /// options are supported.
- ///
- ///
- /// the options name, their synopsis and their explanation, or null
- /// if no options are supported.
- ///
- ///
- public static System.String[][] ParameterInfo
- {
- get
- {
- return pinfo;
- }
-
- }
-
- /// The MaxShiftSpec containing the scaling values for all tile-components
- ///
- ///
- private MaxShiftSpec mss;
-
- /// The prefix for ROI decoder options: 'R'
- public const char OPT_PREFIX = 'R';
-
- /// The list of parameters that is accepted by the entropy decoders. They
- /// start with 'R'.
- ///
- //UPGRADE_NOTE: Final was removed from the declaration of 'pinfo'. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private static readonly System.String[][] pinfo = new System.String[][] { new System.String[] { "Rno_roi", null, "This argument makes sure that the no ROI de-scaling is performed. " + "Decompression is done like there is no ROI in the image", null } };
-
- /// The entropy decoder from where to get the compressed data (the source)
- ///
- ///
- private CBlkQuantDataSrcDec src;
-
- /// Constructor of the ROI descaler, takes EntropyDEcoder as source of data
- /// to de-scale.
- ///
- ///
- /// The EntropyDecoder that is the source of data.
- ///
- ///
- /// The MaxShiftSpec containing the scaling values for all
- /// tile-components
- ///
- ///
- public ROIDeScaler(CBlkQuantDataSrcDec src, MaxShiftSpec mss) : base(src)
- {
- this.src = src;
- this.mss = mss;
- }
-
- /// Returns the subband tree, for the specified tile-component. This method
- /// returns the root element of the subband tree structure, see Subband and
- /// SubbandSyn. The tree comprises all the available resolution levels.
- ///
- /// The number of magnitude bits ('magBits' member variable) for each
- /// subband is not initialized.
- ///
- ///
- /// The index of the tile, from 0 to T-1.
- ///
- ///
- /// The index of the component, from 0 to C-1.
- ///
- ///
- /// The root of the tree structure.
- ///
- ///
- public override SubbandSyn getSynSubbandTree(int t, int c)
- {
- return src.getSynSubbandTree(t, c);
- }
-
- /// Returns the specified code-block in the current tile for the specified
- /// component, as a copy (see below).
- ///
- /// The returned code-block may be progressive, which is indicated by
- /// the 'progressive' variable of the returned 'DataBlk' object. If a
- /// code-block is progressive it means that in a later request to this
- /// method for the same code-block it is possible to retrieve data which is
- /// a better approximation, since meanwhile more data to decode for the
- /// code-block could have been received. If the code-block is not
- /// progressive then later calls to this method for the same code-block
- /// will return the exact same data values.
- ///
- /// The data returned by this method is always a copy of the internal
- /// data of this object, if any, and it can be modified "in place" without
- /// any problems after being returned. The 'offset' of the returned data is
- /// 0, and the 'scanw' is the same as the code-block width. See the
- /// 'DataBlk' class.
- ///
- /// The 'ulx' and 'uly' members of the returned 'DataBlk' object contain
- /// the coordinates of the top-left corner of the block, with respect to
- /// the tile, not the subband.
- ///
- ///
- /// The component for which to return the next code-block.
- ///
- ///
- /// The vertical index of the code-block to return, in the
- /// specified subband.
- ///
- ///
- /// The horizontal index of the code-block to return, in the
- /// specified subband.
- ///
- ///
- /// The subband in which the code-block to return is.
- ///
- ///
- /// If non-null this object will be used to return the new
- /// code-block. If null a new one will be allocated and returned. If the
- /// "data" array of the object is non-null it will be reused, if possible,
- /// to return the data.
- ///
- ///
- /// The next code-block in the current tile for component 'c', or
- /// null if all code-blocks for the current tile have been returned.
- ///
- ///
- ///
- ///
- ///
- public virtual DataBlk getCodeBlock(int c, int m, int n, SubbandSyn sb, DataBlk cblk)
- {
- return getInternCodeBlock(c, m, n, sb, cblk);
- }
-
- /// Returns the specified code-block in the current tile for the specified
- /// component (as a reference or copy).
- ///
- /// The returned code-block may be progressive, which is indicated by
- /// the 'progressive' variable of the returned 'DataBlk' object. If a
- /// code-block is progressive it means that in a later request to this
- /// method for the same code-block it is possible to retrieve data which is
- /// a better approximation, since meanwhile more data to decode for the
- /// code-block could have been received. If the code-block is not
- /// progressive then later calls to this method for the same code-block
- /// will return the exact same data values.
- ///
- /// The data returned by this method can be the data in the internal
- /// buffer of this object, if any, and thus can not be modified by the
- /// caller. The 'offset' and 'scanw' of the returned data can be
- /// arbitrary. See the 'DataBlk' class.
- ///
- /// The 'ulx' and 'uly' members of the returned 'DataBlk' object contain
- /// the coordinates of the top-left corner of the block, with respect to
- /// the tile, not the subband.
- ///
- ///
- /// The component for which to return the next code-block.
- ///
- ///
- /// The vertical index of the code-block to return, in the
- /// specified subband.
- ///
- ///
- /// The horizontal index of the code-block to return, in the
- /// specified subband.
- ///
- ///
- /// The subband in which the code-block to return is.
- ///
- ///
- /// If non-null this object will be used to return the new
- /// code-block. If null a new one will be allocated and returned. If the
- /// "data" array of the object is non-null it will be reused, if possible,
- /// to return the data.
- ///
- ///
- /// The requested code-block in the current tile for component 'c'.
- ///
- ///
- ///
- ///
- ///
- public virtual DataBlk getInternCodeBlock(int c, int m, int n, SubbandSyn sb, DataBlk cblk)
- {
- int i, j, k, wrap; // mi removed
- int ulx, uly, w, h;
- int[] data; // local copy of quantized data
- int tmp;
- //int limit;
-
- // Get data block from entropy decoder
- cblk = src.getInternCodeBlock(c, m, n, sb, cblk);
-
- // If there are no ROIs in the tile, Or if we already got all blocks
- bool noRoiInTile = false;
- if (mss == null || mss.getTileCompVal(TileIdx, c) == null)
- noRoiInTile = true;
-
- if (noRoiInTile || cblk == null)
- {
- return cblk;
- }
- data = (int[])cblk.Data;
- ulx = cblk.ulx;
- uly = cblk.uly;
- w = cblk.w;
- h = cblk.h;
-
- // Scale coefficients according to magnitude. If the magnitude of a
- // coefficient is lower than 2 pow 31-magbits then it is a background
- // coeff and should be up-scaled
- int boost = ((System.Int32)mss.getTileCompVal(TileIdx, c));
- int mask = ((1 << sb.magbits) - 1) << (31 - sb.magbits);
- int mask2 = (~mask) & 0x7FFFFFFF;
-
- wrap = cblk.scanw - w;
- i = cblk.offset + cblk.scanw * (h - 1) + w - 1;
- for (j = h; j > 0; j--)
- {
- for (k = w; k > 0; k--, i--)
- {
- tmp = data[i];
- if ((tmp & mask) == 0)
- {
- // BG
- data[i] = (tmp & unchecked((int)0x80000000)) | (tmp << boost);
- }
- else
- {
- // ROI
- if ((tmp & mask2) != 0)
- {
- // decoded more than magbits bit-planes, set
- // quantization mid-interval approx. bit just after
- // the magbits.
- data[i] = (tmp & (~mask2)) | (1 << (30 - sb.magbits));
- }
- }
- }
- i -= wrap;
- }
- return cblk;
- }
-
- /// Creates a ROIDeScaler object. The information needed to create the
- /// object is the Entropy decoder used and the parameters.
- ///
- ///
- /// The source of data that is to be descaled
- ///
- ///
- /// The parameter list (or options).
- ///
- ///
- /// The decoding specifications
- ///
- ///
- /// If an error occurs while parsing
- /// the options in 'pl'
- ///
- ///
- public static ROIDeScaler createInstance(CBlkQuantDataSrcDec src, ParameterList pl, DecoderSpecs decSpec)
- {
- System.String noRoi;
- //int i;
-
- // Check parameters
- pl.checkList(OPT_PREFIX, CSJ2K.j2k.util.ParameterList.toNameArray(pinfo));
-
- // Check if no_roi specified in command line or no roi signalled
- // in bit stream
- noRoi = pl.getParameter("Rno_roi");
- if (noRoi != null || decSpec.rois == null)
- {
- // no_roi specified in commandline!
- return new ROIDeScaler(src, null);
- }
-
- return new ROIDeScaler(src, decSpec.rois);
- }
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/roi/encoder/ArbROIMaskGenerator.cs b/CSJ2K/j2k/roi/encoder/ArbROIMaskGenerator.cs
deleted file mode 100644
index 7eef4d11..00000000
--- a/CSJ2K/j2k/roi/encoder/ArbROIMaskGenerator.cs
+++ /dev/null
@@ -1,619 +0,0 @@
-/*
-* CVS identifier:
-*
-* $Id: ArbROIMaskGenerator.java,v 1.4 2001/01/03 15:10:21 qtxjoas Exp $
-*
-* Class: ArbROIMaskGenerator
-*
-* Description: Generates masks when only rectangular ROIs exist
-*
-*
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-* */
-using CSJ2K.j2k.image;
-using CSJ2K.j2k.image.input;
-using CSJ2K.j2k.quantization.quantizer;
-using CSJ2K.j2k.wavelet;
-namespace CSJ2K.j2k.roi.encoder
-{
-
- /// This class generates the ROI bit-mask when, at least, one ROI is not
- /// rectangular. In this case, the fast ROI bit-mask algorithm generation can
- /// not be used.
- ///
- /// The values are calculated from the scaling factors of the ROIs. The
- /// values with which to scale are equal to u-umin where umin is the lowest
- /// scaling factor within the block. The umin value is sent to the entropy
- /// coder to be used for scaling the distortion values.
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public class ArbROIMaskGenerator : ROIMaskGenerator
- {
-
- /// The source of quantized wavelet transform coefficients
- private Quantizer src;
-
- /// The ROI mask for the current tile for all components
- private int[][] roiMask;
-
- /// The low frequency part of a mask line
- private int[] maskLineLow;
-
- /// The High frequency part of a mask line
- private int[] maskLineHigh;
-
- /// A line or column of the mask with padding
- private int[] paddedMaskLine;
-
- /// Flag indicating if any ROI was found to be in this tile
- new private bool roiInTile;
-
- /// The constructor of the arbitrary mask generator
- ///
- ///
- /// The ROI info.
- ///
- ///
- /// The number of components
- ///
- ///
- /// The quantizer module
- ///
- ///
- public ArbROIMaskGenerator(ROI[] rois, int nrc, Quantizer src) : base(rois, nrc)
- {
- roiMask = new int[nrc][];
- this.src = src;
- }
-
- /// This functions gets a DataBlk the size of the current code-block an
- /// fills this block with the ROI mask.
- ///
- /// In order to get the mask for a particular Subband, the subband tree
- /// is traversed and at each decomposition, the ROI masks are computed.
- ///
- ///
The widths of the synthesis filters corresponding to the wavelet
- /// filters used in the wavelet transform are used to expand the ROI masks
- /// in the decompositions.
- ///
- ///
- /// The data block that is to be filled with the mask
- ///
- ///
- /// The root of the subband tree to which db belongs
- ///
- ///
- /// The max number of magnitude bits in any code-block
- ///
- ///
- /// The number of the component
- ///
- ///
- /// Whether or not a mask was needed for this tile
- ///
- ///
- public override bool getROIMask(DataBlkInt db, Subband sb, int magbits, int c)
- {
- int x = db.ulx;
- int y = db.uly;
- int w = db.w;
- int h = db.h;
- int tilew = sb.w;
- int tileh = sb.h;
- int[] maskData = (int[])db.Data;
- int i, j, k, bi, wrap;
-
- // If the ROI mask has not been calculated for this tile and
- // component, do so now.
- if (!tileMaskMade[c])
- {
- makeMask(sb, magbits, c);
- tileMaskMade[c] = true;
- }
- if (!roiInTile)
- return false;
-
- int[] mask = roiMask[c]; // local copy
-
- // Copy relevant part of the ROI mask to the datablock
- i = (y + h - 1) * tilew + x + w - 1;
- bi = w * h - 1;
- wrap = tilew - w;
- for (j = h; j > 0; j--)
- {
- for (k = w; k > 0; k--, i--, bi--)
- {
- maskData[bi] = mask[i];
- }
- i -= wrap;
- }
- return true;
- }
-
- /// This function returns the relevant data of the mask generator
- ///
- ///
- public override System.String ToString()
- {
- return ("Fast rectangular ROI mask generator");
- }
-
- /// This function generates the ROI mask for one tile-component.
- ///
- /// Once the mask is generated in the pixel domain. it is decomposed
- /// following the same decomposition scheme as the wavelet transform.
- ///
- ///
- /// The root of the subband tree used in the decomposition
- ///
- ///
- /// The max number of magnitude bits in any code-block
- ///
- ///
- /// component number
- ///
- public override void makeMask(Subband sb, int magbits, int c)
- {
- int[] mask; // local copy
- ROI[] rois = this.roi_array; // local copy
- int i, j, k, r, maxj; // mink, minj removed
- int lrx, lry;
- int x, y, w, h;
- int cx, cy, rad;
- int wrap;
- int curScalVal;
- int tileulx = sb.ulcx;
- int tileuly = sb.ulcy;
- int tilew = sb.w;
- int tileh = sb.h;
- int lineLen = (tilew > tileh) ? tilew : tileh;
-
- // Make sure there is a sufficiently large mask buffer
- if (roiMask[c] == null || (roiMask[c].Length < (tilew * tileh)))
- {
- roiMask[c] = new int[tilew * tileh];
- mask = roiMask[c];
- }
- else
- {
- mask = roiMask[c];
- for (i = tilew * tileh - 1; i >= 0; i--)
- mask[i] = 0;
- }
-
- // Make sure there are sufficiently large line buffers
- if (maskLineLow == null || (maskLineLow.Length < (lineLen + 1) / 2))
- maskLineLow = new int[(lineLen + 1) / 2];
- if (maskLineHigh == null || (maskLineHigh.Length < (lineLen + 1) / 2))
- maskLineHigh = new int[(lineLen + 1) / 2];
-
- roiInTile = false;
- // Generate ROIs in pixel domain:
- for (r = rois.Length - 1; r >= 0; r--)
- {
- if (rois[r].comp == c)
- {
- curScalVal = magbits;
-
- if (rois[r].arbShape)
- {
- ImgReaderPGM maskPGM = rois[r].maskPGM; // Local copy
-
- if ((src.ImgWidth != maskPGM.ImgWidth) || (src.ImgHeight != maskPGM.ImgHeight))
- throw new System.ArgumentException("Input image and" + " ROI mask must " + "have the same " + "size");
- x = src.ImgULX;
- y = src.ImgULY;
- lrx = x + src.ImgWidth - 1;
- lry = y + src.ImgHeight - 1;
- if ((x > tileulx + tilew) || (y > tileuly + tileh) || (lrx < tileulx) || (lry < tileuly))
- // Roi not in tile
- continue;
-
- // Check bounds
- x -= tileulx;
- lrx -= tileulx;
- y -= tileuly;
- lry -= tileuly;
-
- int offx = 0;
- int offy = 0;
- if (x < 0)
- {
- offx = -x;
- x = 0;
- }
- if (y < 0)
- {
- offy = -y;
- y = 0;
- }
- w = (lrx > (tilew - 1)) ? tilew - x : lrx + 1 - x;
- h = (lry > (tileh - 1)) ? tileh - y : lry + 1 - y;
-
-
- // Get shape line by line to reduce memory
- DataBlkInt srcblk = new DataBlkInt();
- int mDcOff = -ImgReaderPGM.DC_OFFSET;
- int nROIcoeff = 0;
- int[] src_data;
- srcblk.ulx = offx;
- srcblk.w = w;
- srcblk.h = 1;
-
- i = (y + h - 1) * tilew + x + w - 1;
- maxj = w;
- wrap = tilew - maxj;
- for (k = h; k > 0; k--)
- {
- srcblk.uly = offy + k - 1;
- srcblk = (DataBlkInt)maskPGM.getInternCompData(srcblk, 0);
- src_data = srcblk.DataInt;
-
- for (j = maxj; j > 0; j--, i--)
- {
- if (src_data[j - 1] != mDcOff)
- {
- mask[i] = curScalVal;
- nROIcoeff++;
- }
- }
- i -= wrap;
- }
-
- if (nROIcoeff != 0)
- {
- roiInTile = true;
- }
- }
- else if (rois[r].rect)
- {
- // Rectangular ROI
- x = rois[r].ulx;
- y = rois[r].uly;
- lrx = rois[r].w + x - 1;
- lry = rois[r].h + y - 1;
-
- if ((x > tileulx + tilew) || (y > tileuly + tileh) || (lrx < tileulx) || (lry < tileuly))
- // Roi not in tile
- continue;
-
- roiInTile = true;
-
- // Check bounds
- x -= tileulx;
- lrx -= tileulx;
- y -= tileuly;
- lry -= tileuly;
-
- x = (x < 0) ? 0 : x;
- y = (y < 0) ? 0 : y;
- w = (lrx > (tilew - 1)) ? tilew - x : lrx + 1 - x;
- h = (lry > (tileh - 1)) ? tileh - y : lry + 1 - y;
-
- i = (y + h - 1) * tilew + x + w - 1;
- maxj = w;
- wrap = tilew - maxj;
- for (k = h; k > 0; k--)
- {
- for (j = maxj; j > 0; j--, i--)
- {
- mask[i] = curScalVal;
- }
- i -= wrap;
- }
- }
- else
- {
- // Non-rectangular ROI. So far only circular case
- cx = rois[r].x - tileulx;
- cy = rois[r].y - tileuly;
- rad = rois[r].r;
- i = tileh * tilew - 1;
- for (k = tileh - 1; k >= 0; k--)
- {
- for (j = tilew - 1; j >= 0; j--, i--)
- {
- if (((j - cx) * (j - cx) + (k - cy) * (k - cy) < rad * rad))
- {
- mask[i] = curScalVal;
- roiInTile = true;
- }
- }
- }
- }
- }
- }
-
- // If wavelet transform is used
- if (sb.isNode)
- {
- // Decompose the mask according to the subband tree
- // Calculate size of padded line buffer
- WaveletFilter vFilter = sb.VerWFilter;
- WaveletFilter hFilter = sb.HorWFilter;
- int lvsup = vFilter.SynLowNegSupport + vFilter.SynLowPosSupport;
- int hvsup = vFilter.SynHighNegSupport + vFilter.SynHighPosSupport;
- int lhsup = hFilter.SynLowNegSupport + hFilter.SynLowPosSupport;
- int hhsup = hFilter.SynHighNegSupport + hFilter.SynHighPosSupport;
- lvsup = (lvsup > hvsup) ? lvsup : hvsup;
- lhsup = (lhsup > hhsup) ? lhsup : hhsup;
- lvsup = (lvsup > lhsup) ? lvsup : lhsup;
- paddedMaskLine = new int[lineLen + lvsup];
-
- if (roiInTile)
- decomp(sb, tilew, tileh, c);
- }
- }
-
- /// This function decomposes the mask for a node in the subband tree.
- /// after the mask is decomposed for a node, this function is called for
- /// the children of the subband. The decomposition is done line by line
- /// and column by column
- ///
- ///
- /// The subband that is to be used for the decomposition
- ///
- ///
- /// The width of the current tile
- ///
- ///
- /// The height of the current tile
- ///
- ///
- /// component number
- ///
- private void decomp(Subband sb, int tilew, int tileh, int c)
- {
- int ulx = sb.ulx;
- int uly = sb.uly;
- int w = sb.w;
- int h = sb.h;
- int scalVal, maxVal = 0;
- int j, k, s, mi = 0, pin; // i, hi, li removed
- int hmax, lmax; // smax removed
- int lineoffs; // wrap, lastlow removed
- int[] mask = roiMask[c]; // local copy
- int[] low = maskLineLow; // local copy
- int[] high = maskLineHigh; // local copy
- int[] padLine = paddedMaskLine; // local copy
- int highFirst = 0;
- int lastpin;
-
-
- if (!sb.isNode)
- return;
-
- // HORIZONTAL DECOMPOSITION
-
- // Calculate number of high and low samples after decomposition
- // and get support for low and high filters
- WaveletFilter filter = sb.HorWFilter;
- int lnSup = filter.SynLowNegSupport;
- int hnSup = filter.SynHighNegSupport;
- int lpSup = filter.SynLowPosSupport;
- int hpSup = filter.SynHighPosSupport;
- int lsup = lnSup + lpSup + 1;
- int hsup = hnSup + hpSup + 1;
-
- // Calculate number of high/low coeffis in subbands
- highFirst = sb.ulcx % 2;
- if (sb.w % 2 == 0)
- {
- lmax = w / 2 - 1;
- hmax = lmax;
- }
- else
- {
- if (highFirst == 0)
- {
- lmax = (w + 1) / 2 - 1;
- hmax = w / 2 - 1;
- }
- else
- {
- hmax = (w + 1) / 2 - 1;
- lmax = w / 2 - 1;
- }
- }
-
- int maxnSup = (lnSup > hnSup) ? lnSup : hnSup; // Maximum negative support
- int maxpSup = (lpSup > hpSup) ? lpSup : hpSup; // Maximum positive support
-
-
- // Set padding to 0
- for (pin = maxnSup - 1; pin >= 0; pin--)
- padLine[pin] = 0;
- for (pin = maxnSup + w - 1 + maxpSup; pin >= w; pin--)
- padLine[pin] = 0;
-
- // Do decomposition of all lines
- lineoffs = (uly + h) * tilew + ulx + w - 1;
- for (j = h - 1; j >= 0; j--)
- {
- lineoffs -= tilew;
- // Get the line to transform from the mask
- mi = lineoffs;
- for (k = w, pin = w - 1 + maxnSup; k > 0; k--, mi--, pin--)
- {
- padLine[pin] = mask[mi];
- }
-
- lastpin = maxnSup + highFirst + 2 * lmax + lpSup;
- for (k = lmax; k >= 0; k--, lastpin -= 2)
- {
- // Low frequency samples
- pin = lastpin;
- for (s = lsup; s > 0; s--, pin--)
- {
- scalVal = padLine[pin];
- if (scalVal > maxVal)
- maxVal = scalVal;
- }
- low[k] = maxVal;
- maxVal = 0;
- }
- lastpin = maxnSup - highFirst + 2 * hmax + 1 + hpSup;
- for (k = hmax; k >= 0; k--, lastpin -= 2)
- {
- // High frequency samples
- pin = lastpin;
- for (s = hsup; s > 0; s--, pin--)
- {
- scalVal = padLine[pin];
- if (scalVal > maxVal)
- maxVal = scalVal;
- }
- high[k] = maxVal;
- maxVal = 0;
- }
- // Put the lows and highs back
- mi = lineoffs;
- for (k = hmax; k >= 0; k--, mi--)
- {
- mask[mi] = high[k];
- }
- for (k = lmax; k >= 0; k--, mi--)
- {
- mask[mi] = low[k];
- }
- }
-
- // VERTICAL DECOMPOSITION
-
- // Calculate number of high and low samples after decomposition
- // and get support for low and high filters
- filter = sb.VerWFilter;
- lnSup = filter.SynLowNegSupport;
- hnSup = filter.SynHighNegSupport;
- lpSup = filter.SynLowPosSupport;
- hpSup = filter.SynHighPosSupport;
- lsup = lnSup + lpSup + 1;
- hsup = hnSup + hpSup + 1;
-
- // Calculate number of high/low coeffs in subbands
- highFirst = sb.ulcy % 2;
- if (sb.h % 2 == 0)
- {
- lmax = h / 2 - 1;
- hmax = lmax;
- }
- else
- {
- if (sb.ulcy % 2 == 0)
- {
- lmax = (h + 1) / 2 - 1;
- hmax = h / 2 - 1;
- }
- else
- {
- hmax = (h + 1) / 2 - 1;
- lmax = h / 2 - 1;
- }
- }
-
- maxnSup = (lnSup > hnSup) ? lnSup : hnSup; // Maximum negative support
- maxpSup = (lpSup > hpSup) ? lpSup : hpSup; // Maximum positive support
-
- // Set padding to 0
- for (pin = maxnSup - 1; pin >= 0; pin--)
- padLine[pin] = 0;
- for (pin = maxnSup + h - 1 + maxpSup; pin >= h; pin--)
- padLine[pin] = 0;
-
- // Do decomposition of all columns
- lineoffs = (uly + h - 1) * tilew + ulx + w;
- for (j = w - 1; j >= 0; j--)
- {
- lineoffs--;
- // Get the line to transform from the mask
- mi = lineoffs;
- for (k = h, pin = k - 1 + maxnSup; k > 0; k--, mi -= tilew, pin--)
- {
- padLine[pin] = mask[mi];
- }
- lastpin = maxnSup + highFirst + 2 * lmax + lpSup;
- for (k = lmax; k >= 0; k--, lastpin -= 2)
- {
- // Low frequency samples
- pin = lastpin;
- for (s = lsup; s > 0; s--, pin--)
- {
- scalVal = padLine[pin];
- if (scalVal > maxVal)
- maxVal = scalVal;
- }
- low[k] = maxVal;
- maxVal = 0;
- }
- lastpin = maxnSup - highFirst + 2 * hmax + 1 + hpSup;
- for (k = hmax; k >= 0; k--, lastpin -= 2)
- {
- // High frequency samples
- pin = lastpin;
- for (s = hsup; s > 0; s--, pin--)
- {
- scalVal = padLine[pin];
- if (scalVal > maxVal)
- maxVal = scalVal;
- }
- high[k] = maxVal;
- maxVal = 0;
- }
- // Put the lows and highs back
- mi = lineoffs;
- for (k = hmax; k >= 0; k--, mi -= tilew)
- {
- mask[mi] = high[k];
- }
- for (k = lmax; k >= 0; k--, mi -= tilew)
- {
- mask[mi] = low[k];
- }
- }
-
- if (sb.isNode)
- {
- decomp(sb.HH, tilew, tileh, c);
- decomp(sb.LH, tilew, tileh, c);
- decomp(sb.HL, tilew, tileh, c);
- decomp(sb.LL, tilew, tileh, c);
- }
- }
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/roi/encoder/ROI.cs b/CSJ2K/j2k/roi/encoder/ROI.cs
deleted file mode 100644
index ba61a1fb..00000000
--- a/CSJ2K/j2k/roi/encoder/ROI.cs
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
-* CVS identifier:
-*
-* $Id: ROI.java,v 1.3 2001/01/03 15:08:15 qtxjoas Exp $
-*
-* Class: ROI
-*
-* Description: This class describes a single ROI
-*
-*
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-*/
-using CSJ2K.j2k.image.input;
-namespace CSJ2K.j2k.roi.encoder
-{
-
- /// This class contains the shape of a single ROI. In the current
- /// implementation only rectangles and circles are supported.
- ///
- ///
- ///
- ///
- public class ROI
- {
-
- /// ImgReaderPGM object with the arbrtrary ROI
- public ImgReaderPGM maskPGM = null;
-
- /// Where or not the ROI shape is arbitrary
- public bool arbShape;
-
- /// Flag indicating whether the ROI is rectangular or not
- public bool rect;
-
- /// The components for which the ROI is relevant
- public int comp;
-
- /// x coordinate of upper left corner of rectangular ROI
- public int ulx;
-
- /// y coordinate of upper left corner of rectangular ROI
- public int uly;
-
- /// width of rectangular ROI
- public int w;
-
- /// height of rectangular ROI
- public int h;
-
- /// x coordinate of center of circular ROI
- public int x;
-
- /// y coordinate of center of circular ROI
- public int y;
-
- /// radius of circular ROI
- public int r;
-
-
- /// Constructor for ROI with arbitrary shape
- ///
- ///
- /// The component the ROI belongs to
- ///
- ///
- /// ImgReaderPGM containing the ROI
- ///
- public ROI(int comp, ImgReaderPGM maskPGM)
- {
- arbShape = true;
- rect = false;
- this.comp = comp;
- this.maskPGM = maskPGM;
- }
-
- /// Constructor for rectangular ROIs
- ///
- ///
- /// The component the ROI belongs to
- ///
- ///
- /// x-coordinate of upper left corner of ROI
- ///
- ///
- /// y-coordinate of upper left corner of ROI
- ///
- ///
- /// width of ROI
- ///
- ///
- /// height of ROI
- ///
- public ROI(int comp, int ulx, int uly, int w, int h)
- {
- arbShape = false;
- this.comp = comp;
- this.ulx = ulx;
- this.uly = uly;
- this.w = w;
- this.h = h;
- rect = true;
- }
-
- /// Constructor for circular ROIs
- ///
- ///
- /// The component the ROI belongs to
- ///
- ///
- /// x-coordinate of center of ROI
- ///
- ///
- /// y-coordinate of center of ROI
- ///
- ///
- /// radius of ROI
- ///
- public ROI(int comp, int x, int y, int rad)
- {
- arbShape = false;
- this.comp = comp;
- this.x = x;
- this.y = y;
- this.r = rad;
- }
-
- /// This function prints all relevant data for the ROI
- public override System.String ToString()
- {
- if (arbShape)
- {
- return "ROI with arbitrary shape, PGM file= " + maskPGM;
- }
- else if (rect)
- return "Rectangular ROI, comp=" + comp + " ulx=" + ulx + " uly=" + uly + " w=" + w + " h=" + h;
- else
- return "Circular ROI, comp=" + comp + " x=" + x + " y=" + y + " radius=" + r;
- }
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/roi/encoder/ROIMaskGenerator.cs b/CSJ2K/j2k/roi/encoder/ROIMaskGenerator.cs
deleted file mode 100644
index 5519dd63..00000000
--- a/CSJ2K/j2k/roi/encoder/ROIMaskGenerator.cs
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
-* CVS identifier:
-*
-* $Id: ROIMaskGenerator.java,v 1.2 2000/11/27 15:03:51 grosbois Exp $
-*
-* Class: ROIMaskGenerator
-*
-* Description: This class describes generators of ROI masks
-*
-*
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-*/
-using CSJ2K.j2k.image;
-using CSJ2K.j2k.wavelet;
-namespace CSJ2K.j2k.roi.encoder
-{
-
- /// This class generates the ROI masks for the ROIScaler.It gives the scaler
- /// the ROI mask for the current code-block.
- ///
- /// The values are calculated from the scaling factors of the ROIs. The
- /// values with which to scale are equal to u-umin where umin is the lowest
- /// scaling factor within the block. The umin value is sent to the entropy
- /// coder to be used for scaling the distortion values.
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public abstract class ROIMaskGenerator
- {
- /// This function returns the ROIs in the image
- ///
- ///
- /// The ROIs in the image
- ///
- virtual public ROI[] ROIs
- {
- get
- {
- return roi_array;
- }
-
- }
-
- /// Array containing the ROIs
- protected internal ROI[] roi_array;
-
- /// Number of components
- protected internal int nrc;
-
- /// Flag indicating whether a mask has been made for the current tile
- protected internal bool[] tileMaskMade;
-
- /* Flag indicating whether there are any ROIs in this tile */
- protected internal bool roiInTile;
-
- /// The constructor of the mask generator
- ///
- ///
- /// The ROIs in the image
- ///
- ///
- /// The number of components
- ///
- public ROIMaskGenerator(ROI[] rois, int nrc)
- {
- this.roi_array = rois;
- this.nrc = nrc;
- tileMaskMade = new bool[nrc];
- }
-
- /// This functions gets a DataBlk with the size of the current code-block
- /// and fills it with the ROI mask. The lowest scaling value in the mask
- /// for this code-block is returned by the function to be used for
- /// modifying the rate distortion estimations.
- ///
- ///
- /// The data block that is to be filled with the mask
- ///
- ///
- /// The root of the current subband tree
- ///
- ///
- /// The number of magnitude bits in this code-block
- ///
- ///
- /// Component number
- ///
- ///
- /// Whether or not a mask was needed for this tile
- ///
- public abstract bool getROIMask(DataBlkInt db, Subband sb, int magbits, int c);
-
- /// This function generates the ROI mask for the entire tile. The mask is
- /// generated for one component. This method is called once for each tile
- /// and component.
- ///
- ///
- /// The root of the subband tree used in the decomposition
- ///
- ///
- /// The max number of magnitude bits in any code-block
- ///
- ///
- /// component number
- ///
- public abstract void makeMask(Subband sb, int magbits, int n);
-
- /// This function is called every time the tile is changed to indicate
- /// that there is need to make a new mask
- ///
- public virtual void tileChanged()
- {
- for (int i = 0; i < nrc; i++)
- tileMaskMade[i] = false;
- }
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/roi/encoder/ROIScaler.cs b/CSJ2K/j2k/roi/encoder/ROIScaler.cs
deleted file mode 100644
index 70ee3c99..00000000
--- a/CSJ2K/j2k/roi/encoder/ROIScaler.cs
+++ /dev/null
@@ -1,809 +0,0 @@
-/*
-* CVS identifier:
-*
-* $Id: ROIScaler.java,v 1.11 2001/09/20 12:42:20 grosbois Exp $
-*
-* Class: ROIScaler
-*
-* Description: This class takes care of the scaling of the
-* samples
-*
-*
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-* */
-using CSJ2K.j2k.encoder;
-using CSJ2K.j2k.image;
-using CSJ2K.j2k.image.input;
-using CSJ2K.j2k.quantization.quantizer;
-using CSJ2K.j2k.util;
-using CSJ2K.j2k.wavelet;
-using CSJ2K.j2k.wavelet.analysis;
-namespace CSJ2K.j2k.roi.encoder
-{
-
- /// This class deals with the ROI functionality.
- ///
- /// The ROI method is the Maxshift method. The ROIScaler works by scaling
- /// the quantized wavelet coefficients that do not affect the ROI (i.e
- /// background coefficients) so that these samples get a lower significance
- /// than the ROI ones. By scaling the coefficients sufficiently, the ROI
- /// coefficients can be recognized by their amplitude alone and no ROI mask
- /// needs to be generated at the decoder side.
- ///
- ///
The source module must be a quantizer and code-block's data is exchange
- /// with thanks to CBlkWTData instances.
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public class ROIScaler : ImgDataAdapter, CBlkQuantDataSrcEnc
- {
- /// Returns the horizontal offset of the code-block partition. Allowable
- /// values are 0 and 1, nothing else.
- ///
- ///
- virtual public int CbULX
- {
- get
- {
- return src.CbULX;
- }
-
- }
- /// Returns the vertical offset of the code-block partition. Allowable
- /// values are 0 and 1, nothing else.
- ///
- ///
- virtual public int CbULY
- {
- get
- {
- return src.CbULY;
- }
-
- }
- /// This function returns the ROI mask generator.
- ///
- ///
- /// The roi mask generator
- ///
- virtual public ROIMaskGenerator ROIMaskGenerator
- {
- get
- {
- return mg;
- }
-
- }
- /// This function returns the blockAligned flag
- ///
- ///
- /// Flag indicating whether the ROIs were block aligned
- ///
- virtual public bool BlockAligned
- {
- get
- {
- return blockAligned;
- }
-
- }
- /// Returns the parameters that are used in this class and
- /// implementing classes. It returns a 2D String array. Each of the
- /// 1D arrays is for a different option, and they have 3
- /// elements. The first element is the option name, the second one
- /// is the synopsis, the third one is a long description of what
- /// the parameter is and the fourth is its default value. The
- /// synopsis or description may be 'null', in which case it is
- /// assumed that there is no synopsis or description of the option,
- /// respectively. Null may be returned if no options are supported.
- ///
- ///
- /// the options name, their synopsis and their explanation,
- /// or null if no options are supported.
- ///
- ///
- public static System.String[][] ParameterInfo
- {
- get
- {
- return pinfo;
- }
-
- }
-
- /// The prefix for ROI Scaler options: 'R'
- public const char OPT_PREFIX = 'R';
-
- /// The list of parameters that are accepted for ROI coding. Options
- /// for ROI Scaler start with 'R'.
- ///
- //UPGRADE_NOTE: Final was removed from the declaration of 'pinfo'. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private static readonly System.String[][] pinfo = new System.String[][] { new System.String[] { "Rroi", "[] R " + " or [] C " + " or [] A ", "Specifies ROIs shape and location. The shape can be either " + "rectangular 'R', or circular 'C' or arbitrary 'A'. " + "Each new occurrence of an 'R', a 'C' or an 'A' is a new ROI. " + "For circular and rectangular ROIs, all values are " + "given as their pixel values relative to the canvas origin. " + "Arbitrary shapes must be included in a PGM file where non 0 " + "values correspond to ROI coefficients. The PGM file must have " + "the size as the image. " + "The component idx specifies which components " + "contain the ROI. The component index is specified as described " + "by points 3 and 4 in the general comment on tile-component idx. " + "If this option is used, the codestream is layer progressive by " + "default unless it is overridden by the 'Aptype' option.", null }, new System.String[] { "Ralign", "[on|off]", "By specifying this argument, the ROI mask will be " + "limited to covering only entire code-blocks. The ROI coding can " + "then be performed without any actual scaling of the coefficients " + "but by instead scaling the distortion estimates.", "off" }, new System.String[] { "Rstart_level", "", "This argument forces the lowest resolution levels to " + "belong to the ROI. By doing this, it is possible to avoid only " + "getting information for the ROI at an early stage of " + "transmission. = 0 means the lowest resolution level " + "belongs to the ROI, 1 means the two lowest etc. (-1 deactivates" + " the option)", "-1" }, new System.String[] { "Rno_rect", "[on|off]", "This argument makes sure that the ROI mask generation is not done " + "using the fast ROI mask generation for rectangular ROIs " + "regardless of whether the specified ROIs are rectangular or not", "off" } };
-
- /// The maximum number of magnitude bit-planes in any subband. One value
- /// for each tile-component
- ///
- private int[][] maxMagBits;
-
- /// Flag indicating the presence of ROIs
- private bool roi;
-
- /// Flag indicating if block aligned ROIs are used
- private bool blockAligned;
-
- /// Number of resolution levels to include in ROI mask
- private int useStartLevel;
-
- /// The class generating the ROI mask
- private ROIMaskGenerator mg;
-
- /// The ROI mask
- private DataBlkInt roiMask;
-
- /// The source of quantized wavelet transform coefficients
- private Quantizer src;
-
- /// Constructor of the ROI scaler, takes a Quantizer as source of data to
- /// scale.
- ///
- ///
- /// The quantizer that is the source of data.
- ///
- ///
- /// The mask generator that will be used for all components
- ///
- ///
- /// Flag indicating whether there are rois specified.
- ///
- ///
- /// The resolution levels that belong entirely to ROI
- ///
- ///
- /// Flag indicating whether block aligning is used.
- ///
- ///
- /// The encoder specifications for addition of roi specs
- ///
- ///
- public ROIScaler(Quantizer src, ROIMaskGenerator mg, bool roi, int sLev, bool uba, EncoderSpecs encSpec) : base(src)
- {
- this.src = src;
- this.roi = roi;
- this.useStartLevel = sLev;
- if (roi)
- {
- // If there is no ROI, no need to do this
- this.mg = mg;
- roiMask = new DataBlkInt();
- calcMaxMagBits(encSpec);
- blockAligned = uba;
- }
- }
-
- /// Since ROI scaling is always a reversible operation, it calls
- /// isReversible() method of it source (the quantizer module).
- ///
- ///
- /// The tile to test for reversibility
- ///
- ///
- /// The component to test for reversibility
- ///
- ///
- /// True if the quantized data is reversible, false if not.
- ///
- ///
- public virtual bool isReversible(int t, int c)
- {
- return src.isReversible(t, c);
- }
-
- /// Returns a reference to the subband tree structure representing the
- /// subband decomposition for the specified tile-component.
- ///
- ///
- /// The index of the tile.
- ///
- ///
- /// The index of the component.
- ///
- ///
- /// The subband tree structure, see SubbandAn.
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public virtual SubbandAn getAnSubbandTree(int t, int c)
- {
- return src.getAnSubbandTree(t, c);
- }
-
- /// Creates a ROIScaler object. The Quantizer is the source of data to
- /// scale.
- ///
- /// The ROI Scaler creates a ROIMaskGenerator depending on what ROI
- /// information is in the ParameterList. If only rectangular ROI are used,
- /// the fast mask generator for rectangular ROI can be used.
- ///
- ///
- /// The source of data to scale
- ///
- ///
- /// The parameter list (or options).
- ///
- ///
- /// The encoder specifications for addition of roi specs
- ///
- ///
- /// If an error occurs while parsing
- /// the options in 'pl'
- ///
- ///
- public static ROIScaler createInstance(Quantizer src, ParameterList pl, EncoderSpecs encSpec)
- {
- System.Collections.ArrayList roiVector = System.Collections.ArrayList.Synchronized(new System.Collections.ArrayList(10));
- ROIMaskGenerator maskGen = null;
-
- // Check parameters
- pl.checkList(OPT_PREFIX, CSJ2K.j2k.util.ParameterList.toNameArray(pinfo));
-
- // Get parameters and check if there are and ROIs specified
- System.String roiopt = pl.getParameter("Rroi");
- if (roiopt == null)
- {
- // No ROIs specified! Create ROIScaler with no mask generator
- return new ROIScaler(src, null, false, -1, false, encSpec);
- }
-
- // Check if the lowest resolution levels should belong to the ROI
- int sLev = pl.getIntParameter("Rstart_level");
-
- // Check if the ROIs are block-aligned
- bool useBlockAligned = pl.getBooleanParameter("Ralign");
-
- // Check if generic mask generation is specified
- bool onlyRect = !pl.getBooleanParameter("Rno_rect");
-
- // Parse the ROIs
- parseROIs(roiopt, src.NumComps, roiVector);
- ROI[] roiArray = new ROI[roiVector.Count];
- roiVector.CopyTo(roiArray);
-
- // If onlyRect has been forced, check if there are any non-rectangular
- // ROIs specified. Currently, only the presence of circular ROIs will
- // make this false
- if (onlyRect)
- {
- for (int i = roiArray.Length - 1; i >= 0; i--)
- if (!roiArray[i].rect)
- {
- onlyRect = false;
- break;
- }
- }
-
- if (onlyRect)
- {
- // It's possible to use the fast ROI mask generation when only
- // rectangular ROIs are specified.
- maskGen = new RectROIMaskGenerator(roiArray, src.NumComps);
- }
- else
- {
- // It's necessary to use the generic mask generation
- maskGen = new ArbROIMaskGenerator(roiArray, src.NumComps, src);
- }
- return new ROIScaler(src, maskGen, true, sLev, useBlockAligned, encSpec);
- }
-
- /// This function parses the values given for the ROIs with the argument
- /// -Rroi. Currently only circular and rectangular ROIs are supported.
- ///
- /// A rectangular ROI is indicated by a 'R' followed the coordinates for
- /// the upper left corner of the ROI and then its width and height.
- ///
- /// A circular ROI is indicated by a 'C' followed by the coordinates of
- /// the circle center and then the radius.
- ///
- /// Before the R and C values, the component that are affected by the
- /// ROI are indicated.
- ///
- ///
- /// The info on the ROIs
- ///
- ///
- /// number of components
- ///
- ///
- /// The vcector containing the ROI parsed from the cmd line
- ///
- ///
- /// The ROIs specified in roiopt
- ///
- ///
- protected internal static System.Collections.ArrayList parseROIs(System.String roiopt, int nc, System.Collections.ArrayList roiVector)
- {
- //ROI[] ROIs;
- ROI roi;
- SupportClass.Tokenizer stok;
- //char tok;
- int nrOfROIs = 0;
- //char c;
- int ulx, uly, w, h, x, y, rad; // comp removed
- bool[] roiInComp = null;
-
- stok = new SupportClass.Tokenizer(roiopt);
-
- System.String word;
- while (stok.HasMoreTokens())
- {
- word = stok.NextToken();
-
- switch (word[0])
- {
-
- case 'c': // Components specification
- roiInComp = ModuleSpec.parseIdx(word, nc);
- break;
-
- case 'R': // Rectangular ROI to be read
- nrOfROIs++;
- try
- {
- word = stok.NextToken();
- ulx = (System.Int32.Parse(word));
- word = stok.NextToken();
- uly = (System.Int32.Parse(word));
- word = stok.NextToken();
- w = (System.Int32.Parse(word));
- word = stok.NextToken();
- h = (System.Int32.Parse(word));
- }
- catch (System.FormatException)
- {
- throw new System.ArgumentException("Bad parameter for " + "'-Rroi R' option : " + word);
- }
- catch (System.ArgumentOutOfRangeException)
- {
- throw new System.ArgumentException("Wrong number of " + "parameters for " + "h'-Rroi R' option.");
- }
-
- // If the ROI is component-specific, check which comps.
- if (roiInComp != null)
- for (int i = 0; i < nc; i++)
- {
- if (roiInComp[i])
- {
- roi = new ROI(i, ulx, uly, w, h);
- roiVector.Add(roi);
- }
- }
- else
- {
- // Otherwise add ROI for all components
- for (int i = 0; i < nc; i++)
- {
- roi = new ROI(i, ulx, uly, w, h);
- roiVector.Add(roi);
- }
- }
- break;
-
- case 'C': // Circular ROI to be read
- nrOfROIs++;
-
- try
- {
- word = stok.NextToken();
- x = (System.Int32.Parse(word));
- word = stok.NextToken();
- y = (System.Int32.Parse(word));
- word = stok.NextToken();
- rad = (System.Int32.Parse(word));
- }
- catch (System.FormatException)
- {
- throw new System.ArgumentException("Bad parameter for " + "'-Rroi C' option : " + word);
- }
- catch (System.ArgumentOutOfRangeException)
- {
- throw new System.ArgumentException("Wrong number of " + "parameters for " + "'-Rroi C' option.");
- }
-
- // If the ROI is component-specific, check which comps.
- if (roiInComp != null)
- for (int i = 0; i < nc; i++)
- {
- if (roiInComp[i])
- {
- roi = new ROI(i, x, y, rad);
- roiVector.Add(roi);
- }
- }
- else
- {
- // Otherwise add ROI for all components
- for (int i = 0; i < nc; i++)
- {
- roi = new ROI(i, x, y, rad);
- roiVector.Add(roi);
- }
- }
- break;
-
- case 'A': // ROI wth arbitrary shape
- nrOfROIs++;
-
- System.String filename;
- ImgReaderPGM maskPGM = null;
-
- try
- {
- filename = stok.NextToken();
- }
- catch (System.ArgumentOutOfRangeException)
- {
- throw new System.ArgumentException("Wrong number of " + "parameters for " + "'-Rroi A' option.");
- }
- try
- {
- maskPGM = new ImgReaderPGM(filename);
- }
- catch (System.IO.IOException)
- {
- throw new System.ApplicationException("Cannot read PGM file with ROI");
- }
-
- // If the ROI is component-specific, check which comps.
- if (roiInComp != null)
- for (int i = 0; i < nc; i++)
- {
- if (roiInComp[i])
- {
- roi = new ROI(i, maskPGM);
- roiVector.Add(roi);
- }
- }
- else
- {
- // Otherwise add ROI for all components
- for (int i = 0; i < nc; i++)
- {
- roi = new ROI(i, maskPGM);
- roiVector.Add(roi);
- }
- }
- break;
-
- default:
- throw new System.ApplicationException("Bad parameters for ROI nr " + roiVector.Count);
-
- }
- }
-
- return roiVector;
- }
-
- /// This function gets a datablk from the entropy coder. The sample sin the
- /// block, which consists of the quantized coefficients from the quantizer,
- /// are scaled by the values given for any ROIs specified.
- ///
- /// The function calls on a ROIMaskGenerator to get the mask for scaling
- /// the coefficients in the current block.
- ///
- /// The data returned by this method is a copy of the orignal
- /// data. Therfore it can be modified "in place" without any problems after
- /// being returned. The 'offset' of the returned data is 0, and the 'scanw'
- /// is the same as the code-block width. See the 'CBlkWTData' class.
- ///
- ///
- /// The component for which to return the next code-block.
- ///
- ///
- /// If non-null this object will be used to return the new
- /// code-block. If null a new one will be allocated and returned. If the
- /// "data" array of the object is non-null it will be reused, if possible,
- /// to return the data.
- ///
- ///
- /// The next code-block in the current tile for component 'n', or
- /// null if all code-blocks for the current tile have been returned.
- ///
- ///
- ///
- ///
- ///
- public virtual CBlkWTData getNextCodeBlock(int c, CBlkWTData cblk)
- {
- return getNextInternCodeBlock(c, cblk);
- }
-
- /// This function gets a datablk from the entropy coder. The sample sin the
- /// block, which consists of the quantized coefficients from the quantizer,
- /// are scaled by the values given for any ROIs specified.
- ///
- /// The function calls on a ROIMaskGenerator to get the mask for scaling
- /// the coefficients in the current block.
- ///
- ///
- /// The component for which to return the next code-block.
- ///
- ///
- /// If non-null this object will be used to return the new
- /// code-block. If null a new one will be allocated and returned. If the
- /// "data" array of the object is non-null it will be reused, if possible,
- /// to return the data.
- ///
- ///
- /// The next code-block in the current tile for component 'n', or
- /// null if all code-blocks for the current tile have been returned.
- ///
- ///
- ///
- ///
- ///
- public virtual CBlkWTData getNextInternCodeBlock(int c, CBlkWTData cblk)
- {
- int mi, i, j, k, wrap;
- int ulx, uly, w, h;
- DataBlkInt mask = roiMask; // local copy of mask
- int[] maskData; // local copy of mask data
- int[] data; // local copy of quantized data
- int tmp;
- int bitMask = 0x7FFFFFFF;
- SubbandAn root, sb;
- int maxBits = 0; // local copy
- bool roiInTile;
- bool sbInMask;
- int nROIcoeff = 0;
-
- // Get codeblock's data from quantizer
- cblk = src.getNextCodeBlock(c, cblk);
-
- // If there is no ROI in the image, or if we already got all
- // code-blocks
- if (!roi || cblk == null)
- {
- return cblk;
- }
-
- data = (int[])cblk.Data;
- sb = cblk.sb;
- ulx = cblk.ulx;
- uly = cblk.uly;
- w = cblk.w;
- h = cblk.h;
- sbInMask = (sb.resLvl <= useStartLevel);
-
- // Check that there is an array for the mask and set it to zero
- maskData = mask.DataInt; // local copy of mask data
- if (maskData == null || w * h > maskData.Length)
- {
- maskData = new int[w * h];
- mask.DataInt = maskData;
- }
- else
- {
- for (i = w * h - 1; i >= 0; i--)
- maskData[i] = 0;
- }
- mask.ulx = ulx;
- mask.uly = uly;
- mask.w = w;
- mask.h = h;
-
- // Get ROI mask from generator
- root = src.getAnSubbandTree(tIdx, c);
- maxBits = maxMagBits[tIdx][c];
- roiInTile = mg.getROIMask(mask, root, maxBits, c);
-
- // If there is no ROI in this tile, return the code-block untouched
- if (!roiInTile && (!sbInMask))
- {
- cblk.nROIbp = 0;
- return cblk;
- }
-
- // Update field containing the number of ROI magnitude bit-planes
- cblk.nROIbp = cblk.magbits;
-
- // If the entire subband belongs to the ROI mask, The code-block is
- // set to belong entirely to the ROI with the highest scaling value
- if (sbInMask)
- {
- // Scale the wmse so that instead of scaling the coefficients, the
- // wmse is scaled.
- //UPGRADE_WARNING: Data types in Visual C# might be different. Verify the accuracy of narrowing conversions. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1042'"
- cblk.wmseScaling *= (float)(1 << (maxBits << 1));
- cblk.nROIcoeff = w * h;
- return cblk;
- }
-
- // In 'block aligned' mode, the code-block is set to belong entirely
- // to the ROI with the highest scaling value if one coefficient, at
- // least, belongs to the ROI
- if (blockAligned)
- {
- wrap = cblk.scanw - w;
- mi = h * w - 1;
- i = cblk.offset + cblk.scanw * (h - 1) + w - 1;
- int nroicoeff = 0;
- for (j = h; j > 0; j--)
- {
- for (k = w - 1; k >= 0; k--, i--, mi--)
- {
- if (maskData[mi] != 0)
- {
- nroicoeff++;
- }
- }
- i -= wrap;
- }
- if (nroicoeff != 0)
- {
- // Include the subband
- //UPGRADE_WARNING: Data types in Visual C# might be different. Verify the accuracy of narrowing conversions. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1042'"
- cblk.wmseScaling *= (float)(1 << (maxBits << 1));
- cblk.nROIcoeff = w * h;
- }
- return cblk;
- }
-
- // Scale background coefficients
- bitMask = (((1 << cblk.magbits) - 1) << (31 - cblk.magbits));
- wrap = cblk.scanw - w;
- mi = h * w - 1;
- i = cblk.offset + cblk.scanw * (h - 1) + w - 1;
- for (j = h; j > 0; j--)
- {
- for (k = w; k > 0; k--, i--, mi--)
- {
- tmp = data[i];
- if (maskData[mi] != 0)
- {
- // ROI coeff. We need to erase fractional bits to ensure
- // that they do not conflict with BG coeffs. This is only
- // strictly necessary for ROI coeffs. which non-fractional
- // magnitude is zero, but much better BG quality can be
- // achieved if done if reset to zero since coding zeros is
- // much more efficient (the entropy coder knows nothing
- // about ROI and cannot avoid coding the ROI fractional
- // bits, otherwise this would not be necessary).
- data[i] = (unchecked((int)0x80000000) & tmp) | (tmp & bitMask);
- nROIcoeff++;
- }
- else
- {
- // BG coeff. it is not necessary to erase fractional bits
- data[i] = (unchecked((int)0x80000000) & tmp) | ((tmp & 0x7FFFFFFF) >> maxBits);
- }
- }
- i -= wrap;
- }
-
- // Modify the number of significant bit-planes in the code-block
- cblk.magbits += maxBits;
-
- // Store the number of ROI coefficients present in the code-block
- cblk.nROIcoeff = nROIcoeff;
-
- return cblk;
- }
-
- /// This function returns the flag indicating if any ROI functionality used
- ///
- ///
- /// Flag indicating whether there are ROIs in the image
- ///
- public virtual bool useRoi()
- {
- return roi;
- }
-
- /// Changes the current tile, given the new indexes. An
- /// IllegalArgumentException is thrown if the indexes do not
- /// correspond to a valid tile.
- ///
- ///
- /// The horizontal index of the tile.
- ///
- ///
- /// The vertical index of the new tile.
- ///
- ///
- public override void setTile(int x, int y)
- {
- base.setTile(x, y);
- if (roi)
- mg.tileChanged();
- }
-
- /// Advances to the next tile, in standard scan-line order (by rows then
- /// columns). An NoNextElementException is thrown if the current tile is
- /// the last one (i.e. there is no next tile).
- ///
- ///
- public override void nextTile()
- {
- base.nextTile();
- if (roi)
- mg.tileChanged();
- }
-
- /// Calculates the maximum amount of magnitude bits for each
- /// tile-component, and stores it in the 'maxMagBits' array. This is called
- /// by the constructor
- ///
- ///
- /// The encoder specifications for addition of roi specs
- ///
- ///
- private void calcMaxMagBits(EncoderSpecs encSpec)
- {
- int tmp;
- MaxShiftSpec rois = encSpec.rois;
-
- int nt = src.getNumTiles();
- int nc = src.NumComps;
-
- maxMagBits = new int[nt][];
- for (int i = 0; i < nt; i++)
- {
- maxMagBits[i] = new int[nc];
- }
-
- src.setTile(0, 0);
- for (int t = 0; t < nt; t++)
- {
- for (int c = nc - 1; c >= 0; c--)
- {
- tmp = src.getMaxMagBits(c);
- maxMagBits[t][c] = tmp;
- rois.setTileCompVal(t, c, (System.Object)tmp);
- }
- if (t < nt - 1)
- src.nextTile();
- }
- // Reset to current initial tile position
- src.setTile(0, 0);
- }
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/roi/encoder/RectROIMaskGenerator.cs b/CSJ2K/j2k/roi/encoder/RectROIMaskGenerator.cs
deleted file mode 100644
index 7e254113..00000000
--- a/CSJ2K/j2k/roi/encoder/RectROIMaskGenerator.cs
+++ /dev/null
@@ -1,325 +0,0 @@
-/*
-* CVS identifier:
-*
-* $Id: RectROIMaskGenerator.java,v 1.4 2001/02/28 15:33:44 grosbois Exp $
-*
-* Class: RectROIMaskGenerator
-*
-* Description: Generates masks when only rectangular ROIs exist
-*
-*
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-* */
-using CSJ2K.j2k.image;
-using CSJ2K.j2k.wavelet;
-namespace CSJ2K.j2k.roi.encoder
-{
-
- /// This class generates the ROI masks when there are only rectangular ROIs in
- /// the image. The ROI mask generation can then be simplified by only
- /// calculating the boundaries of the ROI mask in the particular subbands
- ///
- /// The values are calculated from the scaling factors of the ROIs. The
- /// values with which to scale are equal to u-umin where umin is the lowest
- /// scaling factor within the block. The umin value is sent to the entropy
- /// coder to be used for scaling the distortion values.
- ///
- ///
To generate and to store the boundaries of the ROIs, the class
- /// SubbandRectROIMask is used. There is one tree of SubbandMasks for each
- /// component.
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public class RectROIMaskGenerator : ROIMaskGenerator
- {
-
- /// The upper left xs of the ROIs
- private int[] ulxs;
-
- /// The upper left ys of the ROIs
- private int[] ulys;
-
- /// The lower right xs of the ROIs
- private int[] lrxs;
-
- /// The lower right ys of the ROIs
- private int[] lrys;
-
- /// Number of ROIs
- private int[] nrROIs;
-
- /// The tree of subbandmask. One for each component
- private SubbandRectROIMask[] sMasks;
-
-
- /// The constructor of the mask generator. The constructor is called with
- /// the ROI data. This data is stored in arrays that are used to generate
- /// the SubbandRectROIMask trees for each component.
- ///
- ///
- /// The ROI info.
- ///
- ///
- /// The flag indicating use of Maxshift method.
- ///
- ///
- /// number of components.
- ///
- ///
- public RectROIMaskGenerator(ROI[] ROIs, int nrc) : base(ROIs, nrc)
- {
- int nr = ROIs.Length;
- int r; // c removed
- nrROIs = new int[nrc];
- sMasks = new SubbandRectROIMask[nrc];
-
- // Count number of ROIs per component
- for (r = nr - 1; r >= 0; r--)
- {
- nrROIs[ROIs[r].comp]++;
- }
- }
-
-
- /// This functions gets a DataBlk the size of the current code-block and
- /// fills this block with the ROI mask.
- ///
- /// In order to get the mask for a particular Subband, the subband tree
- /// is traversed and at each decomposition, the ROI masks are computed. The
- /// roi bondaries for each subband are stored in the SubbandRectROIMask
- /// tree.
- ///
- ///
- /// The data block that is to be filled with the mask
- ///
- ///
- /// The root of the subband tree to which db belongs
- ///
- ///
- /// The max number of magnitude bits in any code-block
- ///
- ///
- /// The component for which to get the mask
- ///
- ///
- /// Whether or not a mask was needed for this tile
- ///
- ///
- public override bool getROIMask(DataBlkInt db, Subband sb, int magbits, int c)
- {
- int x = db.ulx;
- int y = db.uly;
- int w = db.w;
- int h = db.h;
- int[] mask = db.DataInt;
- int i, j, k, r, maxk, maxj; // mink, minj removed
- int ulx = 0, uly = 0, lrx = 0, lry = 0;
- int wrap;
- int maxROI;
- int[] culxs;
- int[] culys;
- int[] clrxs;
- int[] clrys;
- SubbandRectROIMask srm;
-
- // If the ROI bounds have not been calculated for this tile and
- // component, do so now.
- if (!tileMaskMade[c])
- {
- makeMask(sb, magbits, c);
- tileMaskMade[c] = true;
- }
-
- if (!roiInTile)
- {
- return false;
- }
-
- // Find relevant subband mask and get ROI bounds
- srm = (SubbandRectROIMask)sMasks[c].getSubbandRectROIMask(x, y);
- culxs = srm.ulxs;
- culys = srm.ulys;
- clrxs = srm.lrxs;
- clrys = srm.lrys;
- maxROI = culxs.Length - 1;
- // Make sure that only parts of ROIs within the code-block are used
- // and make the bounds local to this block the LR bounds are counted
- // as the distance from the lower right corner of the block
- x -= srm.ulx;
- y -= srm.uly;
- for (r = maxROI; r >= 0; r--)
- {
- ulx = culxs[r] - x;
- if (ulx < 0)
- {
- ulx = 0;
- }
- else if (ulx >= w)
- {
- ulx = w;
- }
-
- uly = culys[r] - y;
- if (uly < 0)
- {
- uly = 0;
- }
- else if (uly >= h)
- {
- uly = h;
- }
-
- lrx = clrxs[r] - x;
- if (lrx < 0)
- {
- lrx = -1;
- }
- else if (lrx >= w)
- {
- lrx = w - 1;
- }
-
- lry = clrys[r] - y;
- if (lry < 0)
- {
- lry = -1;
- }
- else if (lry >= h)
- {
- lry = h - 1;
- }
-
- // Add the masks of the ROI
- i = w * lry + lrx;
- maxj = (lrx - ulx);
- wrap = w - maxj - 1;
- maxk = lry - uly;
-
- for (k = maxk; k >= 0; k--)
- {
- for (j = maxj; j >= 0; j--, i--)
- mask[i] = magbits;
- i -= wrap;
- }
- }
- return true;
- }
-
- /// This function returns the relevant data of the mask generator
- ///
- ///
- public override System.String ToString()
- {
- return ("Fast rectangular ROI mask generator");
- }
-
- /// This function generates the ROI mask for the entire tile. The mask is
- /// generated for one component. This method is called once for each tile
- /// and component.
- ///
- ///
- /// The root of the subband tree used in the decomposition
- ///
- ///
- /// component number
- ///
- ///
- public override void makeMask(Subband sb, int magbits, int n)
- {
- int nr = nrROIs[n];
- int r;
- int ulx, uly, lrx, lry;
- int tileulx = sb.ulcx;
- int tileuly = sb.ulcy;
- int tilew = sb.w;
- int tileh = sb.h;
- ROI[] ROIs = roi_array; // local copy
-
- ulxs = new int[nr];
- ulys = new int[nr];
- lrxs = new int[nr];
- lrys = new int[nr];
-
- nr = 0;
-
- for (r = ROIs.Length - 1; r >= 0; r--)
- {
- if (ROIs[r].comp == n)
- {
- ulx = ROIs[r].ulx;
- uly = ROIs[r].uly;
- lrx = ROIs[r].w + ulx - 1;
- lry = ROIs[r].h + uly - 1;
-
- if (ulx > (tileulx + tilew - 1) || uly > (tileuly + tileh - 1) || lrx < tileulx || lry < tileuly)
- // no part of ROI in tile
- continue;
-
- // Check bounds
- ulx -= tileulx;
- lrx -= tileulx;
- uly -= tileuly;
- lry -= tileuly;
-
- ulx = (ulx < 0) ? 0 : ulx;
- uly = (uly < 0) ? 0 : uly;
- lrx = (lrx > (tilew - 1)) ? tilew - 1 : lrx;
- lry = (lry > (tileh - 1)) ? tileh - 1 : lry;
-
- ulxs[nr] = ulx;
- ulys[nr] = uly;
- lrxs[nr] = lrx;
- lrys[nr] = lry;
- nr++;
- }
- }
- if (nr == 0)
- {
- roiInTile = false;
- }
- else
- {
- roiInTile = true;
- }
- sMasks[n] = new SubbandRectROIMask(sb, ulxs, ulys, lrxs, lrys, nr);
- }
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/roi/encoder/SubbandROIMask.cs b/CSJ2K/j2k/roi/encoder/SubbandROIMask.cs
deleted file mode 100644
index 619d1866..00000000
--- a/CSJ2K/j2k/roi/encoder/SubbandROIMask.cs
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
-* CVS identifier:
-*
-* $Id: SubbandROIMask.java,v 1.2 2001/02/28 15:12:44 grosbois Exp $
-*
-* Class: ROI
-*
-* Description: This class describes the ROI mask for a subband
-*
-*
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-* */
-namespace CSJ2K.j2k.roi.encoder
-{
-
- /// This abstract class describes the ROI mask for a single subband. Each
- /// object of the class contains the mask for a particular subband and also has
- /// references to the masks of the children subbands of the subband
- /// corresponding to this mask.
- ///
- public abstract class SubbandROIMask
- {
-
- /// The subband masks of the child LL
- protected internal SubbandROIMask ll;
-
- /// The subband masks of the child LH
- protected internal SubbandROIMask lh;
-
- /// The subband masks of the child HL
- protected internal SubbandROIMask hl;
-
- /// The subband masks of the child HH
- protected internal SubbandROIMask hh;
-
- /// Flag indicating whether this subband mask is a node or not
- protected internal bool isNode;
-
- /// Horizontal uper-left coordinate of the subband mask
- public int ulx;
-
- /// Vertical uper-left coordinate of the subband mask
- public int uly;
-
- /// Width of the subband mask
- public int w;
-
- /// Height of the subband mask
- public int h;
-
- /// The constructor of the SubbandROIMask takes the dimensions of the
- /// subband as parameters
- ///
- ///
- /// The upper left x coordinate of corresponding subband
- ///
- ///
- /// The upper left y coordinate of corresponding subband
- ///
- ///
- /// The width of corresponding subband
- ///
- ///
- /// The height of corresponding subband
- ///
- ///
- public SubbandROIMask(int ulx, int uly, int w, int h)
- {
- this.ulx = ulx;
- this.uly = uly;
- this.w = w;
- this.h = h;
- }
-
- /// Returns a reference to the Subband mask element to which the specified
- /// point belongs. The specified point must be inside this (i.e. the one
- /// defined by this object) subband mask. This method searches through the
- /// tree.
- ///
- ///
- /// horizontal coordinate of the specified point.
- ///
- ///
- /// horizontal coordinate of the specified point.
- ///
- ///
- public virtual SubbandROIMask getSubbandRectROIMask(int x, int y)
- {
- SubbandROIMask cur, hhs;
-
- // Check that we are inside this subband
- if (x < ulx || y < uly || x >= ulx + w || y >= uly + h)
- {
- throw new System.ArgumentException();
- }
-
- cur = this;
- while (cur.isNode)
- {
- hhs = cur.hh;
- // While we are still at a node -> continue
- if (x < hhs.ulx)
- {
- // Is the result of horizontal low-pass
- if (y < hhs.uly)
- {
- // Vertical low-pass
- cur = cur.ll;
- }
- else
- {
- // Vertical high-pass
- cur = cur.lh;
- }
- }
- else
- {
- // Is the result of horizontal high-pass
- if (y < hhs.uly)
- {
- // Vertical low-pass
- cur = cur.hl;
- }
- else
- {
- // Vertical high-pass
- cur = cur.hh;
- }
- }
- }
- return cur;
- }
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/roi/encoder/SubbandRectROIMask.cs b/CSJ2K/j2k/roi/encoder/SubbandRectROIMask.cs
deleted file mode 100644
index 02f81f62..00000000
--- a/CSJ2K/j2k/roi/encoder/SubbandRectROIMask.cs
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
-* CVS identifier:
-*
-* $Id: SubbandRectROIMask.java,v 1.3 2001/02/28 14:53:12 grosbois Exp $
-*
-* Class: ROI
-*
-* Description: This class describes the ROI mask for a subband
-*
-*
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-* */
-using CSJ2K.j2k.wavelet;
-namespace CSJ2K.j2k.roi.encoder
-{
-
- /// This class describes the ROI mask for a single subband. Each object of the
- /// class contains the mask for a particular subband and also has references to
- /// the masks of the children subbands of the subband corresponding to this
- /// mask. This class describes subband masks for images containing only
- /// rectangular ROIS
- ///
- ///
- public class SubbandRectROIMask : SubbandROIMask
- {
-
- /// The upper left x coordinates of the applicable ROIs
- public int[] ulxs;
-
- /// The upper left y coordinates of the applicable ROIs
- public int[] ulys;
-
- /// The lower right x coordinates of the applicable ROIs
- public int[] lrxs;
-
- /// The lower right y coordinates of the applicable ROIs
- public int[] lrys;
-
- /// The constructor of the SubbandROIMask takes the dimensions of the
- /// subband as parameters. A tree of masks is generated from the subband
- /// sb. Each Subband contains the boundaries of each ROI.
- ///
- ///
- /// The subband corresponding to this Subband Mask
- ///
- ///
- /// The upper left x coordinates of the ROIs
- ///
- ///
- /// The upper left y coordinates of the ROIs
- ///
- ///
- /// The lower right x coordinates of the ROIs
- ///
- ///
- /// The lower right y coordinates of the ROIs
- ///
- ///
- /// The lower right y coordinates of the ROIs
- ///
- ///
- /// Number of ROIs that affect this tile
- ///
- ///
- public SubbandRectROIMask(Subband sb, int[] ulxs, int[] ulys, int[] lrxs, int[] lrys, int nr) : base(sb.ulx, sb.uly, sb.w, sb.h)
- {
- this.ulxs = ulxs;
- this.ulys = ulys;
- this.lrxs = lrxs;
- this.lrys = lrys;
- int r;
-
- if (sb.isNode)
- {
- isNode = true;
- // determine odd/even - high/low filters
- int horEvenLow = sb.ulcx % 2;
- int verEvenLow = sb.ulcy % 2;
-
- // Get filter support lengths
- WaveletFilter hFilter = sb.HorWFilter;
- WaveletFilter vFilter = sb.VerWFilter;
- int hlnSup = hFilter.SynLowNegSupport;
- int hhnSup = hFilter.SynHighNegSupport;
- int hlpSup = hFilter.SynLowPosSupport;
- int hhpSup = hFilter.SynHighPosSupport;
- int vlnSup = vFilter.SynLowNegSupport;
- int vhnSup = vFilter.SynHighNegSupport;
- int vlpSup = vFilter.SynLowPosSupport;
- int vhpSup = vFilter.SynHighPosSupport;
-
- // Generate arrays for children
- int x, y;
- int[] lulxs = new int[nr];
- int[] lulys = new int[nr];
- int[] llrxs = new int[nr];
- int[] llrys = new int[nr];
- int[] hulxs = new int[nr];
- int[] hulys = new int[nr];
- int[] hlrxs = new int[nr];
- int[] hlrys = new int[nr];
- for (r = nr - 1; r >= 0; r--)
- {
- // For all ROI calculate ...
- // Upper left x for all children
- x = ulxs[r];
- if (horEvenLow == 0)
- {
- lulxs[r] = (x + 1 - hlnSup) / 2;
- hulxs[r] = (x - hhnSup) / 2;
- }
- else
- {
- lulxs[r] = (x - hlnSup) / 2;
- hulxs[r] = (x + 1 - hhnSup) / 2;
- }
- // Upper left y for all children
- y = ulys[r];
- if (verEvenLow == 0)
- {
- lulys[r] = (y + 1 - vlnSup) / 2;
- hulys[r] = (y - vhnSup) / 2;
- }
- else
- {
- lulys[r] = (y - vlnSup) / 2;
- hulys[r] = (y + 1 - vhnSup) / 2;
- }
- // lower right x for all children
- x = lrxs[r];
- if (horEvenLow == 0)
- {
- llrxs[r] = (x + hlpSup) / 2;
- hlrxs[r] = (x - 1 + hhpSup) / 2;
- }
- else
- {
- llrxs[r] = (x - 1 + hlpSup) / 2;
- hlrxs[r] = (x + hhpSup) / 2;
- }
- // lower right y for all children
- y = lrys[r];
- if (verEvenLow == 0)
- {
- llrys[r] = (y + vlpSup) / 2;
- hlrys[r] = (y - 1 + vhpSup) / 2;
- }
- else
- {
- llrys[r] = (y - 1 + vlpSup) / 2;
- hlrys[r] = (y + vhpSup) / 2;
- }
- }
- // Create children
- hh = new SubbandRectROIMask(sb.HH, hulxs, hulys, hlrxs, hlrys, nr);
- lh = new SubbandRectROIMask(sb.LH, lulxs, hulys, llrxs, hlrys, nr);
- hl = new SubbandRectROIMask(sb.HL, hulxs, lulys, hlrxs, llrys, nr);
- ll = new SubbandRectROIMask(sb.LL, lulxs, lulys, llrxs, llrys, nr);
- }
- }
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/util/ArrayUtil.cs b/CSJ2K/j2k/util/ArrayUtil.cs
deleted file mode 100644
index 1ce3cc59..00000000
--- a/CSJ2K/j2k/util/ArrayUtil.cs
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
-* CVS identifier:
-*
-* $Id: ArrayUtil.java,v 1.10 2000/09/05 09:25:15 grosbois Exp $
-*
-* Class: ArrayUtil
-*
-* Description: Utillities for arrays.
-*
-*
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-*
-*
-*
-*/
-using System;
-namespace CSJ2K.j2k.util
-{
-
- /// This class contains a colleaction of utility static methods for arrays.
- ///
- ///
- public class ArrayUtil
- {
-
- /// The maximum array size to do element by element copying, larger
- /// arrays are copyied in a n optimized way.
- ///
- public const int MAX_EL_COPYING = 8;
-
- /// The number of elements to copy initially in an optimized array copy
- public const int INIT_EL_COPYING = 4;
-
- /// Reinitializes an int array to the given value in an optimized way. If
- /// the length of the array is less than MAX_EL_COPYING, then the array
- /// is set element by element in the normal way, otherwise the first
- /// INIT_EL_COPYING elements are set element by element and then
- /// System.arraycopy is used to set the other parts of the array.
- ///
- ///
- /// The array to set.
- ///
- ///
- /// The value to set the array to.
- ///
- ///
- ///
- ///
- public static void intArraySet(int[] arr, int val)
- {
- int i, len, len2;
-
- len = arr.Length;
- // Set array to 'val' in an optimized way
- if (len < MAX_EL_COPYING)
- {
- // Not worth doing optimized way
- for (i = len - 1; i >= 0; i--)
- {
- // Set elements
- arr[i] = val;
- }
- }
- else
- {
- // Do in optimized way
- len2 = len >> 1;
- for (i = 0; i < INIT_EL_COPYING; i++)
- {
- // Set first elements
- arr[i] = val;
- }
- for (; i <= len2; i <<= 1)
- {
- // Copy values doubling size each time
- Array.Copy(arr, 0, arr, i, i);
- }
- if (i < len)
- {
- // Copy values to end
- Array.Copy(arr, 0, arr, i, len - i);
- }
- }
- }
-
- /// Reinitializes a byte array to the given value in an optimized way. If
- /// the length of the array is less than MAX_EL_COPYING, then the array
- /// is set element by element in the normal way, otherwise the first
- /// INIT_EL_COPYING elements are set element by element and then
- /// System.arraycopy is used to set the other parts of the array.
- ///
- ///
- /// The array to set.
- ///
- ///
- /// The value to set the array to.
- ///
- ///
- ///
- ///
- public static void byteArraySet(byte[] arr, byte val)
- {
- int i, len, len2;
-
- len = arr.Length;
- // Set array to 'val' in an optimized way
- if (len < MAX_EL_COPYING)
- {
- // Not worth doing optimized way
- for (i = len - 1; i >= 0; i--)
- {
- // Set elements
- arr[i] = val;
- }
- }
- else
- {
- // Do in optimized way
- len2 = len >> 1;
- for (i = 0; i < INIT_EL_COPYING; i++)
- {
- // Set first elements
- arr[i] = val;
- }
- for (; i <= len2; i <<= 1)
- {
- // Copy values doubling size each time
- Array.Copy(arr, 0, arr, i, i);
- }
- if (i < len)
- {
- // Copy values to end
- Array.Copy(arr, 0, arr, i, len - i);
- }
- }
- }
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/util/CodestreamManipulator.cs b/CSJ2K/j2k/util/CodestreamManipulator.cs
deleted file mode 100644
index 358f7610..00000000
--- a/CSJ2K/j2k/util/CodestreamManipulator.cs
+++ /dev/null
@@ -1,763 +0,0 @@
-/*
-* CVS identifier:
-*
-* $Id: CodestreamManipulator.java,v 1.17 2001/05/16 13:58:09 qtxjoas Exp $
-*
-* Class: CodestreamManipulator
-*
-* Description: Manipulates codestream to create tile-parts etc
-*
-*
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-* */
-using CSJ2K.j2k.io;
-namespace CSJ2K.j2k.util
-{
-
- /// This class takes a legal JPEG 2000 codestream and performs some
- /// manipulation on it. Currently the manipulations supported are: Tile-parts
- ///
- ///
- public class CodestreamManipulator
- {
- private void InitBlock()
- {
- ppt = new int[nt];
- }
-
- /// Flag indicating whether packed packet headers in main header is used
- ///
- ///
- private bool ppmUsed;
-
- /// Flag indicating whether packed packet headers in tile headers is used
- ///
- ///
- private bool pptUsed;
-
- /// Flag indicating whether SOP marker was only intended for parsing in
- /// This class and should be removed
- ///
- private bool tempSop;
-
- /// Flag indicating whether EPH marker was only intended for parsing in
- /// This class and should be removed
- ///
- private bool tempEph;
-
- /// The number of tiles in the image
- private int nt;
-
- /// The number of packets per tile-part
- private int pptp;
-
- /// The name of the outfile
- private System.String outname;
-
- /// The length of a SOT plus a SOD marker
- private static int TP_HEAD_LEN = 14;
-
- /// The maximum number of a tile part index (TPsot)
- //private static int MAX_TPSOT = 16;
-
- /// The maximum number of tile parts in any tile
- private int maxtp;
-
- /// The number of packets per tile
- //UPGRADE_NOTE: The initialization of 'ppt' was moved to method 'InitBlock'. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1005'"
- private int[] ppt;
-
- /// The positions of the SOT, SOP and EPH markers
- private System.Int32[] positions;
-
- /// The main header
- private byte[] mainHeader;
-
- /// Buffers containing the tile parts
- private byte[][][] tileParts;
-
- /// Buffers containing the original tile headers
- private byte[][] tileHeaders;
-
- /// Buffers contaning the packet headers
- private byte[][][] packetHeaders;
-
- /// Buffers containing the packet data
- private byte[][][] packetData;
-
- /// Buffers containing the SOP marker segments
- private byte[][][] sopMarkSeg;
-
- /// Instantiates a codestream manipulator..
- ///
- ///
- /// The name of the original outfile
- ///
- ///
- /// The number of tiles in the image
- ///
- ///
- /// Packets per tile-part. If zero, no division into tileparts
- /// is performed
- ///
- ///
- /// Flag indicating that PPM marker is used
- ///
- ///
- /// Flag indicating that PPT marker is used
- ///
- ///
- /// Flag indicating whether SOP merker should be removed
- ///
- ///
- /// Flag indicating whether EPH merker should be removed
- ///
- ///
- public CodestreamManipulator(System.String outname, int nt, int pptp, bool ppm, bool ppt, bool tempSop, bool tempEph)
- {
- InitBlock();
- this.outname = outname;
- this.nt = nt;
- this.pptp = pptp;
- this.ppmUsed = ppm;
- this.pptUsed = ppt;
- this.tempSop = tempSop;
- this.tempEph = tempEph;
- }
-
- /// This method performs the actual manipulation of the codestream which is
- /// the reparsing for tile parts and packed packet headers
- ///
- ///
- /// The number of bytes that the file has increased by
- ///
- ///
- /// If an I/O error ocurred.
- ///
- ///
- public virtual int doCodestreamManipulation()
- {
- BEBufferedRandomAccessFile fi;
- int addedHeaderBytes = 0;
- ppt = new int[nt];
- tileParts = new byte[nt][][];
- tileHeaders = new byte[nt][];
- packetHeaders = new byte[nt][][];
- packetData = new byte[nt][][];
- sopMarkSeg = new byte[nt][][];
-
- // If neither packed packet header nor tile parts are used, return 0
- if (ppmUsed == false && pptUsed == false && pptp == 0)
- return 0;
-
- // Open file for reading and writing
- fi = new BEBufferedRandomAccessFile(outname, "rw+");
- addedHeaderBytes -= fi.length();
-
- // Parse the codestream for SOT, SOP and EPH markers
- parseAndFind(fi);
-
- // Read and buffer the tile headers, packet headers and packet data
- readAndBuffer(fi);
-
- // Close file and overwrite with new file
- fi.close();
- fi = new BEBufferedRandomAccessFile(outname, "rw");
-
- // Create tile-parts
- createTileParts();
-
- // Write new codestream
- writeNewCodestream(fi);
-
- // Close file
- fi.flush();
- addedHeaderBytes += fi.length();
- fi.close();
-
- return addedHeaderBytes;
- }
-
- /// This method parses the codestream for SOT, SOP and EPH markers and
- /// removes header header bits signalling SOP and EPH markers if packed
- /// packet headers are used
- ///
- ///
- /// The file to parse the markers from
- ///
- ///
- /// If an I/O error ocurred.
- ///
- ///
- private void parseAndFind(BufferedRandomAccessFile fi)
- {
- int length, pos, i, t, sop = 0, eph = 0;
- short marker;
- int halfMarker;
- int tileEnd;
- System.Collections.ArrayList markPos = System.Collections.ArrayList.Synchronized(new System.Collections.ArrayList(10));
-
- // Find position of first SOT marker
- marker = (short)fi.readUnsignedShort(); // read SOC marker
- marker = (short)fi.readUnsignedShort();
- while (marker != CSJ2K.j2k.codestream.Markers.SOT)
- {
- pos = fi.Pos;
- length = fi.readUnsignedShort();
-
- // If SOP and EPH markers were only used for parsing in this
- // class remove SOP and EPH markers from Scod field
- if (marker == CSJ2K.j2k.codestream.Markers.COD)
- {
- int scod = fi.readUnsignedByte();
- if (tempSop)
- scod &= 0xfd; // Remove bits indicating SOP
- if (tempEph)
- scod &= 0xfb; // Remove bits indicating SOP
- fi.seek(pos + 2);
- fi.write(scod);
- }
-
- fi.seek(pos + length);
- marker = (short)fi.readUnsignedShort();
- }
- pos = fi.Pos;
- fi.seek(pos - 2);
-
- // Find all packet headers, packed data and tile headers
- for (t = 0; t < nt; t++)
- {
- // Read SOT marker
- fi.readUnsignedShort(); // Skip SOT
- pos = fi.Pos;
- markPos.Add((System.Int32)fi.Pos);
- fi.readInt(); // Skip Lsot and Isot
- length = fi.readInt(); // Read Psot
- fi.readUnsignedShort(); // Skip TPsot & TNsot
- tileEnd = pos + length - 2; // Last byte of tile
-
- // Find position of SOD marker
- marker = (short)fi.readUnsignedShort();
- while (marker != CSJ2K.j2k.codestream.Markers.SOD)
- {
- pos = fi.Pos;
- length = fi.readUnsignedShort();
-
- // If SOP and EPH markers were only used for parsing in this
- // class remove SOP and EPH markers from Scod field
- if (marker == CSJ2K.j2k.codestream.Markers.COD)
- {
- int scod = fi.readUnsignedByte();
- if (tempSop)
- scod &= 0xfd; // Remove bits indicating SOP
- if (tempEph)
- scod &= 0xfb; // Remove bits indicating SOP
- fi.seek(pos + 2);
- fi.write(scod);
- }
- fi.seek(pos + length);
- marker = (short)fi.readUnsignedShort();
- }
-
- // Find all SOP and EPH markers in tile
- sop = 0;
- eph = 0;
-
- i = fi.Pos;
- while (i < tileEnd)
- {
- halfMarker = (short)fi.readUnsignedByte();
- if (halfMarker == (short)0xff)
- {
- marker = (short)((halfMarker << 8) + fi.readUnsignedByte());
- i++;
- if (marker == CSJ2K.j2k.codestream.Markers.SOP)
- {
- markPos.Add((System.Int32)fi.Pos);
- ppt[t]++;
- sop++;
- fi.skipBytes(4);
- i += 4;
- }
-
- if (marker == CSJ2K.j2k.codestream.Markers.EPH)
- {
- markPos.Add((System.Int32)fi.Pos);
- eph++;
- }
- }
- i++;
- }
- }
- markPos.Add((System.Int32)(fi.Pos + 2));
- positions = new System.Int32[markPos.Count];
- markPos.CopyTo(positions);
- }
-
- /// This method reads and buffers the tile headers, packet headers and
- /// packet data.
- ///
- ///
- /// The file to read the headers and data from
- ///
- ///
- /// If an I/O error ocurred.
- ///
- ///
- private void readAndBuffer(BufferedRandomAccessFile fi)
- {
- int p, prem, length, t, markIndex;
-
- // Buffer main header
- fi.seek(0);
- length = ((System.Int32)positions[0]) - 2;
- mainHeader = new byte[length];
- fi.readFully(mainHeader, 0, length);
- markIndex = 0;
-
- for (t = 0; t < nt; t++)
- {
- prem = ppt[t];
-
- packetHeaders[t] = new byte[prem][];
- packetData[t] = new byte[prem][];
- sopMarkSeg[t] = new byte[prem][];
-
- // Read tile header
- length = positions[markIndex + 1] - positions[markIndex];
- tileHeaders[t] = new byte[length];
- fi.readFully(tileHeaders[t], 0, length);
- markIndex++;
-
- for (p = 0; p < prem; p++)
- {
- // Read packet header
- length = positions[markIndex + 1] - positions[markIndex];
-
- if (tempSop)
- {
- // SOP marker is skipped
- length -= CSJ2K.j2k.codestream.Markers.SOP_LENGTH;
- fi.skipBytes(CSJ2K.j2k.codestream.Markers.SOP_LENGTH);
- }
- else
- {
- // SOP marker is read and buffered
- length -= CSJ2K.j2k.codestream.Markers.SOP_LENGTH;
- sopMarkSeg[t][p] = new byte[CSJ2K.j2k.codestream.Markers.SOP_LENGTH];
- fi.readFully(sopMarkSeg[t][p], 0, CSJ2K.j2k.codestream.Markers.SOP_LENGTH);
- }
-
- if (!tempEph)
- {
- // EPH marker is kept in header
- length += CSJ2K.j2k.codestream.Markers.EPH_LENGTH;
- }
- packetHeaders[t][p] = new byte[length];
- fi.readFully(packetHeaders[t][p], 0, length);
- markIndex++;
-
- // Read packet data
- length = positions[markIndex + 1] - positions[markIndex];
-
- length -= CSJ2K.j2k.codestream.Markers.EPH_LENGTH;
- if (tempEph)
- {
- // EPH marker is used and is skipped
- fi.skipBytes(CSJ2K.j2k.codestream.Markers.EPH_LENGTH);
- }
-
- packetData[t][p] = new byte[length];
- fi.readFully(packetData[t][p], 0, length);
- markIndex++;
- }
- }
- }
-
- /// This method creates the tileparts from the buffered tile headers,
- /// packet headers and packet data
- ///
- ///
- /// If an I/O error ocurred.
- ///
- ///
- private void createTileParts()
- {
- int i, prem, t, length;
- int pIndex; // phIndex removed
- int tppStart;
- int tilePart;
- int p, np, nomnp;
- int numTileParts;
- int numPackets;
- System.IO.MemoryStream temp = new System.IO.MemoryStream();
- byte[] tempByteArr;
-
- // Create tile parts
- tileParts = new byte[nt][][];
- maxtp = 0;
-
- for (t = 0; t < nt; t++)
- {
- // Calculate number of tile parts. If tileparts are not used,
- // put all packets in the first tilepart
- if (pptp == 0)
- pptp = ppt[t];
- prem = ppt[t];
- //UPGRADE_WARNING: Data types in Visual C# might be different. Verify the accuracy of narrowing conversions. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1042'"
- numTileParts = (int)System.Math.Ceiling(((double)prem) / pptp);
- numPackets = packetHeaders[t].Length;
- maxtp = (numTileParts > maxtp) ? numTileParts : maxtp;
- tileParts[t] = new byte[numTileParts][];
-
- // Create all the tile parts for tile t
- tppStart = 0;
- pIndex = 0;
- p = 0;
- //phIndex = 0;
-
- for (tilePart = 0; tilePart < numTileParts; tilePart++)
- {
-
- // Calculate number of packets in this tilepart
- nomnp = (pptp > prem) ? prem : pptp;
- np = nomnp;
-
- // Write tile part header
- if (tilePart == 0)
- {
- // Write original tile part header up to SOD marker
- temp.Write(tileHeaders[t], 0, tileHeaders[t].Length - 2);
- }
- else
- {
- // Write empty header of length TP_HEAD_LEN-2
- temp.Write(new byte[TP_HEAD_LEN - 2], 0, TP_HEAD_LEN - 2);
- }
-
- // Write PPT marker segments if PPT used
- if (pptUsed)
- {
- int pptLength = 3; // Zppt and Lppt
- int pptIndex = 0;
- int phLength;
-
- p = pIndex;
- while (np > 0)
- {
- phLength = packetHeaders[t][p].Length;
-
- // If the total legth of the packet headers is greater
- // than MAX_LPPT, several PPT markers are needed
- if (pptLength + phLength > CSJ2K.j2k.codestream.Markers.MAX_LPPT)
- {
-
- temp.WriteByte((System.Byte)SupportClass.URShift(CSJ2K.j2k.codestream.Markers.PPT, 8));
- temp.WriteByte((System.Byte)(CSJ2K.j2k.codestream.Markers.PPT & 0x00FF));
- temp.WriteByte((System.Byte)SupportClass.URShift(pptLength, 8));
- temp.WriteByte((System.Byte)pptLength);
- temp.WriteByte((System.Byte)pptIndex++);
- for (i = pIndex; i < p; i++)
- {
- temp.Write(packetHeaders[t][i], 0, packetHeaders[t][i].Length);
- }
- pptLength = 3; // Zppt and Lppt
- pIndex = p;
- }
- pptLength += phLength;
- p++;
- np--;
- }
- // Write last PPT marker
- temp.WriteByte((System.Byte)SupportClass.URShift(CSJ2K.j2k.codestream.Markers.PPT, 8));
- temp.WriteByte((System.Byte)(CSJ2K.j2k.codestream.Markers.PPT & 0x00FF));
- temp.WriteByte((System.Byte)SupportClass.URShift(pptLength, 8));
- temp.WriteByte((System.Byte)pptLength);
- temp.WriteByte((System.Byte)pptIndex);
- for (i = pIndex; i < p; i++)
- {
-
- temp.Write(packetHeaders[t][i], 0, packetHeaders[t][i].Length);
- }
- }
- pIndex = p;
- np = nomnp;
-
- // Write SOD marker
- temp.WriteByte((System.Byte)SupportClass.URShift(CSJ2K.j2k.codestream.Markers.SOD, 8));
- temp.WriteByte((System.Byte)(CSJ2K.j2k.codestream.Markers.SOD & 0x00FF));
-
- // Write packet data and packet headers if PPT and PPM not used
- for (p = tppStart; p < tppStart + np; p++)
- {
- if (!tempSop)
- {
- temp.Write(sopMarkSeg[t][p], 0, CSJ2K.j2k.codestream.Markers.SOP_LENGTH);
- }
-
- if (!(ppmUsed || pptUsed))
- {
- temp.Write(packetHeaders[t][p], 0, packetHeaders[t][p].Length);
- }
-
- temp.Write(packetData[t][p], 0, packetData[t][p].Length);
- }
- tppStart += np;
-
- // Edit tile part header
- tempByteArr = temp.ToArray();
- tileParts[t][tilePart] = tempByteArr;
- length = (int)temp.Length;
-
- if (tilePart == 0)
- {
- // Edit first tile part header
- tempByteArr[6] = (byte)(SupportClass.URShift(length, 24)); // Psot
- tempByteArr[7] = (byte)(SupportClass.URShift(length, 16));
- tempByteArr[8] = (byte)(SupportClass.URShift(length, 8));
- tempByteArr[9] = (byte)(length);
- tempByteArr[10] = (byte)SupportClass.Identity((0)); // TPsot
- tempByteArr[11] = (byte)(numTileParts); // TNsot
- }
- else
- {
- // Edit tile part header
- tempByteArr[0] = (byte)(SupportClass.URShift(CSJ2K.j2k.codestream.Markers.SOT, 8)); // SOT
- tempByteArr[1] = (byte)(CSJ2K.j2k.codestream.Markers.SOT & 0x00FF);
- tempByteArr[2] = (byte)SupportClass.Identity((0)); // Lsot
- tempByteArr[3] = (byte)SupportClass.Identity((10));
- tempByteArr[4] = (byte)(SupportClass.URShift(t, 8)); // Isot
- tempByteArr[5] = (byte)(t); //
- tempByteArr[6] = (byte)(SupportClass.URShift(length, 24)); // Psot
- tempByteArr[7] = (byte)(SupportClass.URShift(length, 16));
- tempByteArr[8] = (byte)(SupportClass.URShift(length, 8));
- tempByteArr[9] = (byte)(length);
- tempByteArr[10] = (byte)(tilePart); //TPsot
- tempByteArr[11] = (byte)(numTileParts); // TNsot
- }
- //UPGRADE_ISSUE: Method 'java.io.ByteArrayOutputStream.reset' was not converted. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1000_javaioByteArrayOutputStreamreset'"
- //temp.reset();
- temp.SetLength(0);
- prem -= np;
- }
- }
- temp.Close();
- }
-
- /// This method writes the new codestream to the file.
- ///
- ///
- /// The file to write the new codestream to
- ///
- ///
- /// If an I/O error ocurred.
- ///
- ///
- private void writeNewCodestream(BufferedRandomAccessFile fi)
- {
- int t, p, tp; // i removed
- int numTiles = tileParts.Length;
- int[][] packetHeaderLengths = new int[numTiles][];
- for (int i2 = 0; i2 < numTiles; i2++)
- {
- packetHeaderLengths[i2] = new int[maxtp];
- }
- byte[] temp;
- int length;
-
- // Write main header up to SOT marker
- fi.write(mainHeader, 0, mainHeader.Length);
-
- // If PPM used write all packet headers in PPM markers
- if (ppmUsed)
- {
- System.IO.MemoryStream ppmMarkerSegment = new System.IO.MemoryStream();
- int numPackets;
- int totNumPackets;
- int ppmIndex = 0;
- int ppmLength;
- int pStart, pStop;
- int[] prem = new int[numTiles];
-
- // Set number of remaining packets
- for (t = 0; t < numTiles; t++)
- {
- prem[t] = packetHeaders[t].Length;
- }
-
- // Calculate Nppm values
- for (tp = 0; tp < maxtp; tp++)
- {
- for (t = 0; t < numTiles; t++)
- {
- if (tileParts[t].Length > tp)
- {
- totNumPackets = packetHeaders[t].Length;
- // Calculate number of packets in this tilepart
- numPackets = (tp == tileParts[t].Length - 1) ? prem[t] : pptp;
-
- pStart = totNumPackets - prem[t];
- pStop = pStart + numPackets;
-
- // Calculate number of packet header bytes for this
- // tile part
- for (p = pStart; p < pStop; p++)
- packetHeaderLengths[t][tp] += packetHeaders[t][p].Length;
-
- prem[t] -= numPackets;
- }
- }
- }
-
- // Write first PPM marker
- ppmMarkerSegment.WriteByte((System.Byte)SupportClass.URShift(CSJ2K.j2k.codestream.Markers.PPM, 8));
- ppmMarkerSegment.WriteByte((System.Byte)(CSJ2K.j2k.codestream.Markers.PPM & 0x00FF));
- ppmMarkerSegment.WriteByte((System.Byte)0); // Temporary Lppm value
- ppmMarkerSegment.WriteByte((System.Byte)0); // Temporary Lppm value
- ppmMarkerSegment.WriteByte((System.Byte)0); // zppm
- ppmLength = 3;
- ppmIndex++;
-
- // Set number of remaining packets
- for (t = 0; t < numTiles; t++)
- prem[t] = packetHeaders[t].Length;
-
- // Write all PPM markers and information
- for (tp = 0; tp < maxtp; tp++)
- {
- for (t = 0; t < numTiles; t++)
- {
-
- if (tileParts[t].Length > tp)
- {
- totNumPackets = packetHeaders[t].Length;
-
- // Calculate number of packets in this tilepart
- numPackets = (tp == tileParts[t].Length - 1) ? prem[t] : pptp;
-
- pStart = totNumPackets - prem[t];
- pStop = pStart + numPackets;
-
- // If Nppm value wont fit in current PPM marker segment
- // write current PPM marker segment and start new
- if (ppmLength + 4 > CSJ2K.j2k.codestream.Markers.MAX_LPPM)
- {
- // Write current PPM marker
- temp = ppmMarkerSegment.ToArray();
- length = temp.Length - 2;
- temp[2] = (byte)(SupportClass.URShift(length, 8));
- temp[3] = (byte)length;
- fi.write(temp, 0, length + 2);
-
- // Start new PPM marker segment
- //UPGRADE_ISSUE: Method 'java.io.ByteArrayOutputStream.reset' was not converted. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1000_javaioByteArrayOutputStreamreset'"
- //ppmMarkerSegment.reset();
- ppmMarkerSegment.SetLength(0);
- ppmMarkerSegment.WriteByte((System.Byte)SupportClass.URShift(CSJ2K.j2k.codestream.Markers.PPM, 8));
- ppmMarkerSegment.WriteByte((System.Byte)(CSJ2K.j2k.codestream.Markers.PPM & 0x00FF));
- ppmMarkerSegment.WriteByte((System.Byte)0); // Temporary Lppm value
- ppmMarkerSegment.WriteByte((System.Byte)0); // Temporary Lppm value
- ppmMarkerSegment.WriteByte((System.Byte)ppmIndex++); // zppm
- ppmLength = 3;
- }
-
- // Write Nppm value
- length = packetHeaderLengths[t][tp];
- ppmMarkerSegment.WriteByte((System.Byte)SupportClass.URShift(length, 24));
- ppmMarkerSegment.WriteByte((System.Byte)SupportClass.URShift(length, 16));
- ppmMarkerSegment.WriteByte((System.Byte)SupportClass.URShift(length, 8));
- ppmMarkerSegment.WriteByte((System.Byte)length);
- ppmLength += 4;
-
- // Write packet headers
- for (p = pStart; p < pStop; p++)
- {
- length = packetHeaders[t][p].Length;
-
- // If next packet header value wont fit in
- // current PPM marker segment write current PPM
- // marker segment and start new
- if (ppmLength + length > CSJ2K.j2k.codestream.Markers.MAX_LPPM)
- {
- // Write current PPM marker
- temp = ppmMarkerSegment.ToArray();
- length = temp.Length - 2;
- temp[2] = (byte)(SupportClass.URShift(length, 8));
- temp[3] = (byte)length;
- fi.write(temp, 0, length + 2);
-
- // Start new PPM marker segment
- //UPGRADE_ISSUE: Method 'java.io.ByteArrayOutputStream.reset' was not converted. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1000_javaioByteArrayOutputStreamreset'"
- //ppmMarkerSegment.reset();
- ppmMarkerSegment.SetLength(0);
- ppmMarkerSegment.WriteByte((System.Byte)SupportClass.URShift(CSJ2K.j2k.codestream.Markers.PPM, 8));
- ppmMarkerSegment.WriteByte((System.Byte)(CSJ2K.j2k.codestream.Markers.PPM & 0x00FF));
- ppmMarkerSegment.WriteByte((System.Byte)0); // Temp Lppm value
- ppmMarkerSegment.WriteByte((System.Byte)0); // Temp Lppm value
- ppmMarkerSegment.WriteByte((System.Byte)ppmIndex++); // zppm
- ppmLength = 3;
- }
-
- // write packet header
- ppmMarkerSegment.Write(packetHeaders[t][p], 0, packetHeaders[t][p].Length);
- ppmLength += packetHeaders[t][p].Length;
- }
- prem[t] -= numPackets;
- }
- }
- }
- // Write last PPM marker segment
- temp = ppmMarkerSegment.ToArray();
- length = temp.Length - 2;
- temp[2] = (byte)(SupportClass.URShift(length, 8));
- temp[3] = (byte)length;
- fi.write(temp, 0, length + 2);
- }
-
- // Write tile parts interleaved
- for (tp = 0; tp < maxtp; tp++)
- {
- for (t = 0; t < nt; t++)
- {
- if (tileParts[t].Length > tp)
- {
- temp = tileParts[t][tp];
- length = temp.Length;
- fi.write(temp, 0, length);
- }
- }
- }
- fi.writeShort(CSJ2K.j2k.codestream.Markers.EOC);
- }
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/util/FacilityManager.cs b/CSJ2K/j2k/util/FacilityManager.cs
deleted file mode 100644
index f90fcdff..00000000
--- a/CSJ2K/j2k/util/FacilityManager.cs
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
-* CVS identifier:
-*
-* $Id: FacilityManager.java,v 1.12 2002/05/22 15:00:24 grosbois Exp $
-*
-* Class: MsgLoggerManager
-*
-* Description: Manages common facilities across threads
-*
-*
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-* */
-namespace CSJ2K.j2k.util
-{
-
- /// This class manages common facilities for multi-threaded
- /// environments, It can register different facilities for each thread,
- /// and also a default one, so that they can be referred by static
- /// methods, while possibly having different ones for different
- /// threads. Also a default facility exists that is used for threads
- /// for which no particular facility has been registerd registered.
- ///
- /// Currently the only kind of facilities managed is MsgLogger.
- ///
- /// An example use of this class is if 2 instances of a decoder are running
- /// in different threads and the messages of the 2 instances should be
- /// separated.
- ///
- ///
The default MsgLogger is a StreamMsgLogger that uses System.out as
- /// the 'out' stream and System.err as the 'err' stream, and a line width of
- /// 78. This can be changed using the registerMsgLogger() method.
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public class FacilityManager
- {
- /// Returns the ProgressWatch instance registered with the current
- /// thread (the thread that calls this method). If the current
- /// thread has no registered ProgressWatch, then the default one is used.
- ///
- ///
- public static ProgressWatch ProgressWatch
- {
- get
- {
- ProgressWatch pw = (ProgressWatch)watchProgList[SupportClass.ThreadClass.Current()];
- return (pw == null) ? defWatchProg : pw;
- }
-
- }
-
- /// The loggers associated to different threads
- //UPGRADE_NOTE: Final was removed from the declaration of 'loggerList '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private static readonly System.Collections.Hashtable loggerList = System.Collections.Hashtable.Synchronized(new System.Collections.Hashtable());
-
- /// The default logger, for threads that have none associated with them
- private static MsgLogger defMsgLogger = new StreamMsgLogger(System.Console.OpenStandardOutput(), System.Console.OpenStandardError(), 78);
-
- /// The ProgressWatch instance associated to different threads
- //UPGRADE_NOTE: Final was removed from the declaration of 'watchProgList '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private static readonly System.Collections.Hashtable watchProgList = System.Collections.Hashtable.Synchronized(new System.Collections.Hashtable());
-
- /// The default ProgressWatch for threads that have none
- /// associated with them.
- ///
- private static ProgressWatch defWatchProg = null;
-
-
- internal static void registerProgressWatch(SupportClass.ThreadClass t, ProgressWatch pw)
- {
- if (pw == null)
- {
- throw new System.NullReferenceException();
- }
- if (t == null)
- {
- defWatchProg = pw;
- }
- else
- {
- watchProgList[t] = pw;
- }
- }
-
- /// Registers the MsgLogger 'ml' as the logging facility of the
- /// thread 't'. If any other logging facility was registered with
- /// the thread 't' it is overriden by 'ml'. If 't' is null then
- /// 'ml' is taken as the default message logger that is used for
- /// threads that have no MsgLogger registered.
- ///
- ///
- /// The thread to associate with 'ml'
- ///
- ///
- /// The MsgLogger to associate with therad ml
- ///
- ///
- internal static void registerMsgLogger(SupportClass.ThreadClass t, MsgLogger ml)
- {
- if (ml == null)
- {
- throw new System.NullReferenceException();
- }
- if (t == null)
- {
- defMsgLogger = ml;
- }
- else
- {
- loggerList[t] = ml;
- }
- }
-
- /// Returns the MsgLogger registered with the current thread (the
- /// thread that calls this method). If the current thread has no
- /// registered MsgLogger then the default message logger is
- /// returned.
- ///
- ///
- /// The MsgLogger registerd for the current thread, or the
- /// default one if there is none registered for it.
- ///
- ///
- public static MsgLogger getMsgLogger()
- {
- MsgLogger ml = (MsgLogger)loggerList[SupportClass.ThreadClass.Current()];
- return (ml == null) ? defMsgLogger : ml;
- }
-
- /// Returns the MsgLogger registered with the thread 't' (the
- /// thread that calls this method). If the thread 't' has no
- /// registered MsgLogger then the default message logger is
- /// returned.
- ///
- ///
- /// The thread for which to return the MsgLogger
- ///
- ///
- /// The MsgLogger registerd for the current thread, or the
- /// default one if there is none registered for it.
- ///
- ///
- internal static MsgLogger getMsgLogger(SupportClass.ThreadClass t)
- {
- MsgLogger ml = (MsgLogger)loggerList[t];
- return (ml == null) ? defMsgLogger : ml;
- }
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/util/ISRandomAccessIO.cs b/CSJ2K/j2k/util/ISRandomAccessIO.cs
deleted file mode 100644
index c13665ef..00000000
--- a/CSJ2K/j2k/util/ISRandomAccessIO.cs
+++ /dev/null
@@ -1,743 +0,0 @@
-/*
-* CVS identifier:
-*
-* $Id: ISRandomAccessIO.java,v 1.2 2001/04/09 16:58:15 grosbois Exp $
-*
-* Class: ISRandomAccessIO
-*
-* Description: Turns an InsputStream into a read-only
-* RandomAccessIO, using buffering.
-*
-*
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-* */
-using CSJ2K.j2k.io;
-using System;
-namespace CSJ2K.j2k.util
-{
-
- /// This class implements a wrapper to turn an InputStream into a
- /// RandomAccessIO. To provide random access, the input data from the
- /// InputStream is cached in an in-memory buffer. The in-memory buffer size can
- /// be limited to a specified size. The data is read into the cache on a as
- /// needed basis, blocking only when necessary.
- ///
- /// The cache grows automatically as necessary. However, if the data length
- /// is known prior to the creation of a ISRandomAccessIO object, it is best to
- /// specify that as the initial in-memory buffer size. That will minimize data
- /// copying and multiple allocation.
- ///
- ///
Multi-byte data is read in big-endian order. The in-memory buffer
- /// storage is released when 'close()' is called. This class can only be used
- /// for data input, not output. The wrapped InputStream is closed when all the
- /// input data is cached or when 'close()' is called.
- ///
- /// If an out of memory condition is encountered when growing the in-memory
- /// buffer an IOException is thrown instead of an OutOfMemoryError. The
- /// exception message is "Out of memory to cache input data".
- ///
- /// This class is intended for use as a "quick and dirty" way to give
- /// network connectivity to RandomAccessIO based classes. It is not intended as
- /// an efficient means of implementing network connectivity. Doing such
- /// requires reimplementing the RandomAccessIO based classes to directly use
- /// network connections.
- ///
- /// This class does not use temporary files as buffers, because that would
- /// preclude the use in unsigned applets.
- ///
- ///
- public class ISRandomAccessIO : RandomAccessIO
- {
- /// Returns the current position in the stream, which is the position from
- /// where the next byte of data would be read. The first byte in the stream
- /// is in position 0.
- ///
- ///
- /// If an I/O error occurred.
- ///
- ///
- virtual public int Pos
- {
- get
- {
- return pos;
- }
-
- }
- /// Returns the endianess (i.e., byte ordering) of multi-byte I/O
- /// operations. Always EndianType.BIG_ENDIAN since this class implements
- /// only big-endian.
- ///
- ///
- /// Always EndianType.BIG_ENDIAN.
- ///
- ///
- ///
- ///
- ///
- virtual public int ByteOrdering
- {
- get
- {
- return CSJ2K.j2k.io.EndianType_Fields.BIG_ENDIAN;
- }
-
- }
-
- /// The InputStream that is wrapped
- private System.IO.Stream is_Renamed;
-
- /* Tha maximum size, in bytes, of the in memory buffer. The maximum size
- * includes the EOF. */
- private int maxsize;
-
- /* The increment, in bytes, for the in-memory buffer size */
- private int inc;
-
- /* The in-memory buffer to cache received data */
- private byte[] buf;
-
- /* The length of the already received data */
- private int len;
-
- /* The position of the next byte to be read from the in-memory buffer */
- private int pos;
-
- /* Flag to indicate if all the data has been received. That is, if the EOF
- * has been reached. */
- private bool complete;
-
- /// Creates a new RandomAccessIO wrapper for the given InputStream
- /// 'is'. The internal cache buffer will have size 'size' and will
- /// increment by 'inc' each time it is needed. The maximum buffer size is
- /// limited to 'maxsize'.
- ///
- ///
- /// The input from where to get the data.
- ///
- ///
- /// The initial size for the cache buffer, in bytes.
- ///
- ///
- /// The size increment for the cache buffer, in bytes.
- ///
- ///
- /// The maximum size for the cache buffer, in bytes.
- ///
- ///
- public ISRandomAccessIO(System.IO.Stream is_Renamed, int size, int inc, int maxsize)
- {
- if (size < 0 || inc <= 0 || maxsize <= 0 || is_Renamed == null)
- {
- throw new System.ArgumentException();
- }
- this.is_Renamed = is_Renamed;
- // Increase size by one to count in EOF
- if (size < System.Int32.MaxValue)
- size++;
- buf = new byte[size];
- this.inc = inc;
- // The maximum size is one byte more, to allow reading the EOF.
- if (maxsize < System.Int32.MaxValue)
- maxsize++;
- this.maxsize = maxsize;
- pos = 0;
- len = 0;
- complete = false;
- }
-
- /// Creates a new RandomAccessIO wrapper for the given InputStream
- /// 'is'. The internal cache buffer size and increment is to to 256 kB. The
- /// maximum buffer size is set to Integer.MAX_VALUE (2 GB).
- ///
- ///
- /// The input from where to get the data.
- ///
- ///
- public ISRandomAccessIO(System.IO.Stream is_Renamed) : this(is_Renamed, 1 << 18, 1 << 18, System.Int32.MaxValue)
- {
- }
-
- /// Grows the cache buffer by 'inc', upto a maximum of 'maxsize'. The
- /// buffer size will be increased by at least one byte, if no exception is
- /// thrown.
- ///
- ///
- /// If the maximum cache size is reached or if not
- /// enough memory is available to grow the buffer.
- ///
- ///
- private void growBuffer()
- {
- byte[] newbuf;
- int effinc; // effective increment
-
- effinc = inc;
- if (buf.Length + effinc > maxsize)
- effinc = maxsize - buf.Length;
- if (effinc <= 0)
- {
- throw new System.IO.IOException("Reached maximum cache size (" + maxsize + ")");
- }
- try
- {
- newbuf = new byte[buf.Length + inc];
- }
- catch (System.OutOfMemoryException)
- {
- throw new System.IO.IOException("Out of memory to cache input data");
- }
- Array.Copy(buf, 0, newbuf, 0, len);
- buf = newbuf;
- }
-
- /// Reads data from the wrapped InputStream and places it in the cache
- /// buffer. Reads all input data that will not cause it to block, but at
- /// least on byte is read (even if it blocks), unless EOF is reached. This
- /// method can not be called if EOF has been already reached
- /// (i.e. 'complete' is true). The wrapped InputStream is closed if the EOF
- /// is reached.
- ///
- ///
- /// An I/O error occurred, out of meory to grow
- /// cache or maximum cache size reached.
- ///
- ///
- private void readInput()
- {
- int n;
- //int b;
- int k;
-
- if (complete)
- {
- throw new System.ArgumentException("Already reached EOF");
- }
- long available;
- available = is_Renamed.Length - is_Renamed.Position;
- n = (int)available; /* how much can we read without blocking? */
- if (n == 0)
- n = 1; /* read at least one byte (even if it blocks) */
- while (len + n > buf.Length)
- {
- /* Ensure buffer size */
- growBuffer();
- }
- /* Read the data. Loop to be sure that we do read 'n' bytes */
- do
- {
- // CONVERSION PROBLEM? OPTIMIZE!!!
- k = is_Renamed.Read(buf, len, n);
- if (k > 0)
- {
- /* Some data was read */
- len += k;
- n -= k;
- }
- }
- while (n > 0 && k > 0);
- if (k <= 0)
- {
- /* we reached EOF */
- complete = true;
- is_Renamed.Close();
- is_Renamed = null;
- }
- }
-
- /// Closes this object for reading as well as the wrapped InputStream, if
- /// not already closed. The memory used by the cache is released.
- ///
- ///
- /// If an I/O error occurs while closing the
- /// underlying InputStream.
- ///
- ///
- public virtual void close()
- {
- buf = null;
- if (!complete)
- {
- is_Renamed.Close();
- is_Renamed = null;
- }
- }
-
- /// Moves the current position for the next read operation to offset. The
- /// offset is measured from the beginning of the stream. If the offset is
- /// set beyond the currently cached data, the missing data will be read
- /// only when a read operation is performed. Setting the offset beyond the
- /// end of the data will cause an EOFException only if the data length is
- /// currently known, otherwise an IOException will occur when a read
- /// operation is attempted at that position.
- ///
- ///
- /// The offset where to move to.
- ///
- ///
- /// If seeking beyond EOF and the data length is
- /// known.
- ///
- ///
- /// If an I/O error ocurred.
- ///
- ///
- public virtual void seek(int off)
- {
- if (complete)
- {
- /* we know the length, check seek is within length */
- if (off > len)
- {
- throw new System.IO.EndOfStreamException();
- }
- }
- pos = off;
- }
-
- /// Returns the length of the stream. This will cause all the data to be
- /// read. This method will block until all the data is read, which can be
- /// lengthy across the network.
- ///
- ///
- /// The length of the stream, in bytes.
- ///
- ///
- /// If an I/O error ocurred.
- ///
- ///
- public virtual int length()
- {
- while (!complete)
- {
- /* read until we reach EOF */
- readInput();
- }
- return len;
- }
-
- /// Reads a byte of data from the stream.
- ///
- ///
- /// The byte read, as an int in the range [0-255].
- ///
- ///
- /// If the end-of file was reached.
- ///
- ///
- /// If an I/O error ocurred.
- ///
- ///
- public virtual byte readByte() { return read(); }
- public virtual byte read()
- {
- if (pos < len)
- {
- // common, fast case
- return buf[pos++];
- }
- // general case
- while (!complete && pos >= len)
- {
- readInput();
- }
- if (pos == len)
- {
- throw new System.IO.EndOfStreamException();
- }
- else if (pos > len)
- {
- throw new System.IO.IOException("Position beyond EOF");
- }
- return buf[pos++];
- }
-
- /// Reads 'len' bytes of data from this file into an array of bytes. This
- /// method reads repeatedly from the stream until all the bytes are
- /// read. This method blocks until all the bytes are read, the end of the
- /// stream is detected, or an exception is thrown.
- ///
- ///
- /// The buffer into which the data is to be read. It must be long
- /// enough.
- ///
- ///
- /// The index in 'b' where to place the first byte read.
- ///
- ///
- /// The number of bytes to read.
- ///
- ///
- /// If the end-of file was reached before getting
- /// all the necessary data.
- ///
- ///
- /// If an I/O error ocurred.
- ///
- ///
- public virtual void readFully(byte[] b, int off, int n)
- {
- if (pos + n <= len)
- {
- // common, fast case
- Array.Copy(buf, pos, b, off, n);
- pos += n;
- return;
- }
- // general case
- while (!complete && pos + n > len)
- {
- readInput();
- }
- if (pos + n > len)
- {
- throw new System.IO.EndOfStreamException();
- }
- Array.Copy(buf, pos, b, off, n);
- pos += n;
- }
-
- /// Reads an unsigned byte (8 bit) from the input.
- ///
- ///
- /// The next byte-aligned unsigned byte (8 bit) from the input.
- ///
- ///
- /// If the end-of file was reached before getting
- /// all the necessary data.
- ///
- ///
- /// If an I/O error ocurred.
- ///
- ///
- public virtual byte readUnsignedByte()
- {
- if (pos < len)
- {
- // common, fast case
- return buf[pos++];
- }
- // general case
- return read();
- }
-
- /// Reads a signed short (16 bit) from the input.
- ///
- ///
- /// The next byte-aligned signed short (16 bit) from the input.
- ///
- ///
- /// If the end-of file was reached before getting
- /// all the necessary data.
- ///
- ///
- /// If an I/O error ocurred.
- ///
- ///
- public virtual short readShort()
- {
- if (pos + 1 < len)
- {
- // common, fast case
- return (short)((buf[pos++] << 8) | (0xFF & buf[pos++]));
- }
- // general case
- return (short)((read() << 8) | read());
- }
-
- /// Reads an unsigned short (16 bit) from the input.
- ///
- ///
- /// The next byte-aligned unsigned short (16 bit) from the input.
- ///
- ///
- /// If the end-of file was reached before getting
- /// all the necessary data.
- ///
- ///
- /// If an I/O error ocurred.
- ///
- ///
- public virtual int readUnsignedShort()
- {
- if (pos + 1 < len)
- {
- // common, fast case
- return ((0xFF & buf[pos++]) << 8) | (0xFF & buf[pos++]);
- }
- // general case
- return (read() << 8) | read();
- }
-
- /// Reads a signed int (32 bit) from the input.
- ///
- ///
- /// The next byte-aligned signed int (32 bit) from the
- /// input.
- ///
- ///
- /// If the end-of file was reached before getting
- /// all the necessary data.
- ///
- ///
- /// If an I/O error ocurred.
- ///
- ///
- public virtual int readInt()
- {
- if (pos + 3 < len)
- {
- // common, fast case
- return ((buf[pos++] << 24) | ((0xFF & buf[pos++]) << 16) | ((0xFF & buf[pos++]) << 8) | (0xFF & buf[pos++]));
- }
- // general case
- return (read() << 24) | (read() << 16) | (read() << 8) | read();
- }
-
- /// Reads a unsigned int (32 bit) from the input.
- ///
- ///
- /// The next byte-aligned unsigned int (32 bit) from the input.
- ///
- ///
- /// If the end-of file was reached before getting
- /// all the necessary data.
- ///
- ///
- /// If an I/O error ocurred.
- ///
- ///
- public virtual long readUnsignedInt()
- {
- if (pos + 3 < len)
- {
- // common, fast case
- return (unchecked((int)0xFFFFFFFFL) & (long)((buf[pos++] << 24) | ((0xFF & buf[pos++]) << 16) | ((0xFF & buf[pos++]) << 8) | (0xFF & buf[pos++])));
- }
- // general case
- return (unchecked((int)0xFFFFFFFFL) & (long)((read() << 24) | (read() << 16) | (read() << 8) | read()));
- }
-
- /// Reads a signed long (64 bit) from the input.
- ///
- ///
- /// The next byte-aligned signed long (64 bit) from the input.
- ///
- ///
- /// If the end-of file was reached before getting
- /// all the necessary data.
- ///
- ///
- /// If an I/O error ocurred.
- ///
- ///
- public virtual long readLong()
- {
- if (pos + 7 < len)
- {
- // common, fast case
- return (((long)buf[pos++] << 56) | ((long)buf[pos++] << 48) | ((long)buf[pos++] << 40) | ((long)buf[pos++] << 32) | ((long)buf[pos++] << 24) | ((long)buf[pos++] << 16) | ((long)buf[pos++] << 8) | (long)buf[pos++]);
- }
- // general case
- return (((long)read() << 56) | ((long)read() << 48) | ((long)read() << 40) | ((long)read() << 32) | ((long)read() << 24) | ((long)read() << 16) | ((long)read() << 8) | (long)read());
- }
-
- /// Reads an IEEE single precision (i.e., 32 bit) floating-point number
- /// from the input.
- ///
- ///
- /// The next byte-aligned IEEE float (32 bit) from the input.
- ///
- ///
- /// If the end-of file was reached before getting
- /// all the necessary data.
- ///
- ///
- /// If an I/O error ocurred.
- ///
- ///
- public virtual float readFloat()
- {
- // CONVERSION PROBLEM? BIGENDIAN
- int floatint;
- if (pos + 3 < len)
- floatint = (buf[pos++] << 24) | ((0xFF & buf[pos++]) << 16) | ((0xFF & buf[pos++]) << 8) | (0xFF & buf[pos++]);
- else
- floatint = (read() << 24) | (read() << 16) | (read() << 8) | read();
- return BitConverter.ToSingle(BitConverter.GetBytes(floatint), 0);
-
- /*
- if (pos + 3 < len)
- {
- // common, fast case
- //UPGRADE_ISSUE: Method 'java.lang.Float.intBitsToFloat' was not converted. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1000_javalangFloatintBitsToFloat_int'"
- return Float.intBitsToFloat((buf[pos++] << 24) | ((0xFF & buf[pos++]) << 16) | ((0xFF & buf[pos++]) << 8) | (0xFF & buf[pos++]));
- }
- // general case
- //UPGRADE_ISSUE: Method 'java.lang.Float.intBitsToFloat' was not converted. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1000_javalangFloatintBitsToFloat_int'"
- return Float.intBitsToFloat((read() << 24) | (read() << 16) | (read() << 8) | read());
- */
- }
-
- /// Reads an IEEE double precision (i.e., 64 bit) floating-point number
- /// from the input.
- ///
- ///
- /// The next byte-aligned IEEE double (64 bit) from the input.
- ///
- ///
- /// If the end-of file was reached before getting
- /// all the necessary data.
- ///
- ///
- /// If an I/O error ocurred.
- ///
- ///
- public virtual double readDouble()
- {
- // CONVERSION PROBLEM? BIGENDIAN
- long doublelong;
- if (pos + 7 < len)
- doublelong = ((long)buf[pos++] << 56) | ((long)buf[pos++] << 48) | ((long)buf[pos++] << 40) | ((long)buf[pos++] << 32) | ((long)buf[pos++] << 24) | ((long)buf[pos++] << 16) | ((long)buf[pos++] << 8) | (long)buf[pos++];
- else
- doublelong = ((long)read() << 56) | ((long)read() << 48) | ((long)read() << 40) | ((long)read() << 32) | ((long)read() << 24) | ((long)read() << 16) | ((long)read() << 8) | (long)read();
- return BitConverter.ToDouble(BitConverter.GetBytes(doublelong), 0);
-
- /*
- if (pos + 7 < len)
- {
- // common, fast case
- //UPGRADE_ISSUE: Method 'java.lang.Double.longBitsToDouble' was not converted. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1000_javalangDoublelongBitsToDouble_long'"
- return Double.longBitsToDouble(((long) buf[pos++] << 56) | ((long) (0xFF & buf[pos++]) << 48) | ((long) (0xFF & buf[pos++]) << 40) | ((long) (0xFF & buf[pos++]) << 32) | ((long) (0xFF & buf[pos++]) << 24) | ((long) (0xFF & buf[pos++]) << 16) | ((long) (0xFF & buf[pos++]) << 8) | (long) (0xFF & buf[pos++]));
- }
- // general case
- //UPGRADE_ISSUE: Method 'java.lang.Double.longBitsToDouble' was not converted. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1000_javalangDoublelongBitsToDouble_long'"
- return Double.longBitsToDouble(((long) read() << 56) | ((long) read() << 48) | ((long) read() << 40) | ((long) read() << 32) | ((long) read() << 24) | ((long) read() << 16) | ((long) read() << 8) | (long) read());
- */
- }
-
- /// Skips 'n' bytes from the input.
- ///
- ///
- /// The number of bytes to skip
- ///
- ///
- /// Always n.
- ///
- ///
- /// If the end-of file was reached before all the
- /// bytes could be skipped.
- ///
- ///
- /// If an I/O error ocurred.
- ///
- ///
- public virtual int skipBytes(int n)
- {
- if (complete)
- {
- /* we know the length, check skip is within length */
- if (pos + n > len)
- {
- throw new System.IO.EndOfStreamException();
- }
- }
- pos += n;
- return n;
- }
-
- /// Does nothing since this class does not implement data output.
- ///
- ///
- public virtual void flush()
- {
- /* no-op */
- }
-
- /// Throws an IOException since this class does not implement data output.
- ///
- ///
- public virtual void write(byte b)
- {
- throw new System.IO.IOException("read-only");
- }
-
- /// Throws an IOException since this class does not implement data output.
- ///
- ///
- public virtual void writeByte(int v)
- {
- throw new System.IO.IOException("read-only");
- }
-
- /// Throws an IOException since this class does not implement data output.
- ///
- ///
- public virtual void writeShort(int v)
- {
- throw new System.IO.IOException("read-only");
- }
-
- /// Throws an IOException since this class does not implement data output.
- ///
- ///
- public virtual void writeInt(int v)
- {
- throw new System.IO.IOException("read-only");
- }
-
- /// Throws an IOException since this class does not implement data output.
- ///
- ///
- public virtual void writeLong(long v)
- {
- throw new System.IO.IOException("read-only");
- }
-
- /// Throws an IOException since this class does not implement data output.
- ///
- ///
- public virtual void writeFloat(float v)
- {
- throw new System.IO.IOException("read-only");
- }
-
- /// Throws an IOException since this class does not implement data output.
- ///
- ///
- public virtual void writeDouble(double v)
- {
- throw new System.IO.IOException("read-only");
- }
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/util/MathUtil.cs b/CSJ2K/j2k/util/MathUtil.cs
deleted file mode 100644
index 85fd55b3..00000000
--- a/CSJ2K/j2k/util/MathUtil.cs
+++ /dev/null
@@ -1,206 +0,0 @@
-/*
-* CVS identifier:
-*
-* $Id: MathUtil.java,v 1.15 2001/09/14 08:48:51 grosbois Exp $
-*
-* Class: MathUtil
-*
-* Description: Utility mathematical methods
-*
-*
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-* */
-namespace CSJ2K.j2k.util
-{
-
- /// This class contains a collection of utility methods fro mathematical
- /// operations. All methods are static.
- ///
- ///
- public class MathUtil
- {
-
- /// Method that calculates the floor of the log, base 2, of 'x'. The
- /// calculation is performed in integer arithmetic, therefore, it is exact.
- ///
- ///
- /// The value to calculate log2 on.
- ///
- ///
- /// floor(log(x)/log(2)), calculated in an exact way.
- ///
- ///
- public static int log2(int x)
- {
- int y, v;
- // No log of 0 or negative
- if (x <= 0)
- {
- throw new System.ArgumentException("" + x + " <= 0");
- }
- // Calculate log2 (it's actually floor log2)
- v = x;
- y = -1;
- while (v > 0)
- {
- v >>= 1;
- y++;
- }
- return y;
- }
-
- /// Method that calculates the Least Common Multiple (LCM) of two strictly
- /// positive integer numbers.
- ///
- ///
- /// First number
- ///
- ///
- /// Second number
- ///
- ///
- public static int lcm(int x1, int x2)
- {
- if (x1 <= 0 || x2 <= 0)
- {
- throw new System.ArgumentException("Cannot compute the least " + "common multiple of two " + "numbers if one, at least," + "is negative.");
- }
- int max, min;
- if (x1 > x2)
- {
- max = x1;
- min = x2;
- }
- else
- {
- max = x2;
- min = x1;
- }
- for (int i = 1; i <= min; i++)
- {
- if ((max * i) % min == 0)
- {
- return i * max;
- }
- }
- throw new System.ApplicationException("Cannot find the least common multiple of numbers " + x1 + " and " + x2);
- }
-
- /// Method that calculates the Least Common Multiple (LCM) of several
- /// positive integer numbers.
- ///
- ///
- /// Array containing the numbers.
- ///
- ///
- public static int lcm(int[] x)
- {
- if (x.Length < 2)
- {
- throw new System.ApplicationException("Do not use this method if there are less than" + " two numbers.");
- }
- int tmp = lcm(x[x.Length - 1], x[x.Length - 2]);
- for (int i = x.Length - 3; i >= 0; i--)
- {
- if (x[i] <= 0)
- {
- throw new System.ArgumentException("Cannot compute the least " + "common multiple of " + "several numbers where " + "one, at least," + "is negative.");
- }
- tmp = lcm(tmp, x[i]);
- }
- return tmp;
- }
-
- /// Method that calculates the Greatest Common Divisor (GCD) of two
- /// positive integer numbers.
- ///
- ///
- public static int gcd(int x1, int x2)
- {
- if (x1 < 0 || x2 < 0)
- {
- throw new System.ArgumentException("Cannot compute the GCD " + "if one integer is negative.");
- }
- int a, b, g, z;
-
- if (x1 > x2)
- {
- a = x1;
- b = x2;
- }
- else
- {
- a = x2;
- b = x1;
- }
-
- if (b == 0)
- return 0;
-
- g = b;
-
- while (g != 0)
- {
- z = a % g;
- a = g;
- g = z;
- }
- return a;
- }
-
- /// Method that calculates the Greatest Common Divisor (GCD) of several
- /// positive integer numbers.
- ///
- ///
- /// Array containing the numbers.
- ///
- ///
- public static int gcd(int[] x)
- {
- if (x.Length < 2)
- {
- throw new System.ApplicationException("Do not use this method if there are less than" + " two numbers.");
- }
- int tmp = gcd(x[x.Length - 1], x[x.Length - 2]);
- for (int i = x.Length - 3; i >= 0; i--)
- {
- if (x[i] < 0)
- {
- throw new System.ArgumentException("Cannot compute the least " + "common multiple of " + "several numbers where " + "one, at least," + "is negative.");
- }
- tmp = gcd(tmp, x[i]);
- }
- return tmp;
- }
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/util/MsgLogger.cs b/CSJ2K/j2k/util/MsgLogger.cs
deleted file mode 100644
index 2e5b6ee8..00000000
--- a/CSJ2K/j2k/util/MsgLogger.cs
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
-* CVS identifier:
-*
-* $Id: MsgLogger.java,v 1.7 2001/08/17 16:24:51 grosbois Exp $
-*
-* Class: MsgLogger
-*
-* Description: Facility to log messages (abstract)
-*
-*
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-* */
-namespace CSJ2K.j2k.util
-{
-
- /// This class provides a simple common abstraction of a facility that logs
- /// and/or displays messages or simple strings. The underlying facility can be
- /// a terminal, text file, text area in a GUI display, dialog boxes in a GUI
- /// display, etc., or a combination of those.
- ///
- /// <>Messages are short strings (a couple of lines) that indicate some state
- /// of the program, and that have a severity code associated with them (see
- /// below). Simple strings is text (can be long) that has no severity code
- /// associated with it. Typical use of simple strings is to display help
- /// texts.
- ///
- /// Each message has a severity code, which can be one of the following:
- /// LOG, INFO, WARNING, ERROR. Each implementation should treat each severity
- /// code in a way which corresponds to the type of diplay used.
- ///
- /// Messages are printed via the 'printmsg()' method. Simple strings are
- /// printed via the 'print()', 'println()' and 'flush()' methods, each simple
- /// string is considered to be terminated once the 'flush()' method has been
- /// called. The 'printmsg()' method should never be called before a previous
- /// simple string has been terminated.
- ///
- ///
- public struct MsgLogger_Fields
- {
- /// Severity of message. LOG messages are just for bookkeeping and do not
- /// need to be displayed in the majority of cases
- ///
- public const int LOG = 0;
- /// Severity of message. INFO messages should be displayed just for user
- /// feedback.
- ///
- public const int INFO = 1;
- /// Severity of message. WARNING messages denote that an unexpected state
- /// has been reached and should be given as feedback to the user.
- ///
- public const int WARNING = 2;
- /// Severity of message. ERROR messages denote that something has gone
- /// wrong and probably that execution has ended. They should be definetely
- /// displayed to the user.
- ///
- public const int ERROR = 3;
- }
- public interface MsgLogger
- {
- //UPGRADE_NOTE: Members of interface 'MsgLogger' were extracted into structure 'MsgLogger_Fields'. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1045'"
-
- /// Prints the message 'msg' to the output device, appending a newline,
- /// with severity 'sev'. Some implementations where the appended newline is
- /// irrelevant may not append the newline. Depending on the implementation
- /// the severity of the message may be added to it. The message is
- /// reformatted as appropriate for the output devic, but any newline
- /// characters are respected.
- ///
- ///
- /// The message severity (LOG, INFO, etc.)
- ///
- ///
- /// The message to display
- ///
- ///
- void printmsg(int sev, System.String msg);
-
- /// Prints the string 'str' to the output device, appending a line
- /// return. The message is reformatted as appropriate to the particular
- /// diplaying device, where 'flind' and 'ind' are used as hints for
- /// performing that operation. However, any newlines appearing in 'str' are
- /// respected. The output device may not display the string until flush()
- /// is called. Some implementations may automatically flush when this
- /// method is called. This method just prints the string, the string does
- /// not make part of a "message" in the sense that no severity is
- /// associated to it.
- ///
- ///
- /// The string to print
- ///
- ///
- /// Indentation of the first line
- ///
- ///
- /// Indentation of any other lines.
- ///
- ///
- void println(System.String str, int flind, int ind);
-
- /// Writes any buffered data from the println() method to the device.
- ///
- ///
- void flush();
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/util/MsgPrinter.cs b/CSJ2K/j2k/util/MsgPrinter.cs
deleted file mode 100644
index b3ab3a18..00000000
--- a/CSJ2K/j2k/util/MsgPrinter.cs
+++ /dev/null
@@ -1,321 +0,0 @@
-/*
-* CVS identifier:
-*
-* $Id: MsgPrinter.java,v 1.6 2000/09/05 09:25:24 grosbois Exp $
-*
-* Class: MsgPrinter
-*
-* Description: Prints messages formatted for a specific
-* line width.
-*
-*
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-*
-*
-*
-*/
-namespace CSJ2K.j2k.util
-{
-
- /// This utility class formats messages to the specified line width, by
- /// inserting line-breaks between words, and printing the resulting
- /// lines.
- ///
- ///
- public class MsgPrinter
- {
- //UPGRADE_NOTE: Respective javadoc comments were merged. It should be changed in order to comply with .NET documentation conventions. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1199'"
- /// Returns the line width that is used for formatting.
- ///
- ///
- /// The line width used for formatting
- ///
- ///
- ///
- ///
- /// Sets the line width to the specified value. This new value will
- /// be used in subsequent calls to the print() message.
- ///
- ///
- /// The new line width to use (in cahracters)
- ///
- ///
- ///
- ///
- virtual public int LineWidth
- {
- get
- {
- return lw;
- }
-
- set
- {
- if (value < 1)
- {
- throw new System.ArgumentException();
- }
- lw = value;
- }
-
- }
-
- /// The line width to use
- public int lw;
-
- /// Signals that a newline was found
- private const int IS_NEWLINE = -2;
-
- /// Signals that the end-of-string was reached
- private const int IS_EOS = -1;
-
- /// Creates a new message printer with the specified line width and
- /// with the default locale.
- ///
- ///
- /// The line width for which to format (in
- /// characters)
- ///
- ///
- ///
- ///
- public MsgPrinter(int linewidth)
- {
- lw = linewidth;
- }
-
- /// Formats the message to print in the current line width, by
- /// breaking the message into lines between words. The number of
- /// spaces to indent the first line is specified by 'flind' and the
- /// number of spaces to indent each of the following lines is
- /// specified by 'ind'. Newlines in 'msg' are respected. A newline is
- /// always printed at the end.
- ///
- ///
- /// Where to print the message.
- ///
- ///
- /// The indentation for the first line.
- ///
- ///
- /// The indentation for the other lines.
- ///
- ///
- /// The message to format and print.
- ///
- ///
- ///
- ///
- public virtual void print(System.IO.StreamWriter out_Renamed, int flind, int ind, System.String msg)
- {
- int start, end, pend, efflw, lind, i;
-
- start = 0;
- end = 0;
- pend = 0;
- efflw = lw - flind;
- lind = flind;
- while ((end = nextLineEnd(msg, pend)) != IS_EOS)
- {
- if (end == IS_NEWLINE)
- {
- // Forced line break
- for (i = 0; i < lind; i++)
- {
- out_Renamed.Write(" ");
- }
- //UPGRADE_TODO: Method 'java.io.PrintWriter.println' was converted to 'System.IO.TextWriter.WriteLine' which has a different behavior. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1073_javaioPrintWriterprintln_javalangString'"
- out_Renamed.WriteLine(msg.Substring(start, (pend) - (start)));
- if (nextWord(msg, pend) == msg.Length)
- {
- // Traling newline => print it and done
- //UPGRADE_TODO: Method 'java.io.PrintWriter.println' was converted to 'System.IO.TextWriter.WriteLine' which has a different behavior. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1073_javaioPrintWriterprintln_javalangString'"
- out_Renamed.WriteLine("");
- start = pend;
- break;
- }
- }
- else
- {
- if (efflw > end - pend)
- {
- // Room left on current line
- efflw -= (end - pend);
- pend = end;
- continue;
- }
- else
- {
- // Filled-up current line => print it
- for (i = 0; i < lind; i++)
- {
- out_Renamed.Write(" ");
- }
- if (start == pend)
- {
- // Word larger than line width
- // Print anyways
- //UPGRADE_TODO: Method 'java.io.PrintWriter.println' was converted to 'System.IO.TextWriter.WriteLine' which has a different behavior. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1073_javaioPrintWriterprintln_javalangString'"
- out_Renamed.WriteLine(msg.Substring(start, (end) - (start)));
- pend = end;
- }
- else
- {
- //UPGRADE_TODO: Method 'java.io.PrintWriter.println' was converted to 'System.IO.TextWriter.WriteLine' which has a different behavior. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1073_javaioPrintWriterprintln_javalangString'"
- out_Renamed.WriteLine(msg.Substring(start, (pend) - (start)));
- }
- }
- }
- // Initialize for next line
- lind = ind;
- efflw = lw - ind;
- start = nextWord(msg, pend);
- pend = start;
- if (start == IS_EOS)
- {
- break; // Did all the string
- }
- }
- if (pend != start)
- {
- // Part of a line left => print it
- for (i = 0; i < lind; i++)
- {
- out_Renamed.Write(" ");
- }
- //UPGRADE_TODO: Method 'java.io.PrintWriter.println' was converted to 'System.IO.TextWriter.WriteLine' which has a different behavior. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1073_javaioPrintWriterprintln_javalangString'"
- out_Renamed.WriteLine(msg.Substring(start, (pend) - (start)));
- }
- }
-
- /// Returns the index of the last character of the next word, plus 1, or
- /// IS_NEWLINE if a newline character is encountered before the next word,
- /// or IS_EOS if the end of the string is ecnounterd before the next
- /// word. The method first skips all whitespace characters at or after
- /// 'from', except newlines. If a newline is found IS_NEWLINE is
- /// returned. Then it skips all non-whitespace characters and returns the
- /// position of the last non-whitespace character, plus 1. The returned
- /// index may be greater than the last valid index in the tsring, but it is
- /// always suitable to be used in the String.substring() method.
- ///
- /// Non-whitespace characters are defined as in the
- /// Character.isWhitespace method (that method is used).
- ///
- ///
- /// The string to parse
- ///
- ///
- /// The index of the first position to search from
- ///
- ///
- /// The index of the last character in the next word, plus 1,
- /// IS_NEWLINE, or IS_EOS if there are no more words.
- ///
- ///
- ///
- ///
- private int nextLineEnd(System.String str, int from)
- {
- //UPGRADE_NOTE: Final was removed from the declaration of 'len '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- int len = str.Length;
- char c = '\x0000';
- // First skip all whitespace, except new line
- while (from < len && (c = str[from]) != '\n' && System.Char.IsWhiteSpace(c))
- {
- from++;
- }
- if (c == '\n')
- {
- return IS_NEWLINE;
- }
- if (from >= len)
- {
- return IS_EOS;
- }
- // Now skip word characters
- while (from < len && !System.Char.IsWhiteSpace(str[from]))
- {
- from++;
- }
- return from;
- }
-
- /// Returns the position of the first character in the next word, starting
- /// from 'from', if a newline is encountered first then the index of the
- /// newline character plus 1 is returned. If the end of the string is
- /// encountered then IS_EOS is returned. Words are defined as any
- /// concatenation of 1 or more characters which are not
- /// whitespace. Whitespace characters are those for which
- /// Character.isWhitespace() returns true (that method is used).
- ///
- /// Non-whitespace characters are defined as in the
- /// Character.isWhitespace method (that method is used).
- ///
- ///
- /// The string to parse
- ///
- ///
- /// The index where to start parsing
- ///
- ///
- /// The index of the first character of the next word, or the index
- /// of the newline plus 1, or IS_EOS.
- ///
- ///
- ///
- ///
- private int nextWord(System.String str, int from)
- {
- //UPGRADE_NOTE: Final was removed from the declaration of 'len '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- int len = str.Length;
- char c = '\x0000';
- // First skip all whitespace, but new lines
- while (from < len && (c = str[from]) != '\n' && System.Char.IsWhiteSpace(c))
- {
- from++;
- }
- if (from >= len)
- {
- return IS_EOS;
- }
- else if (c == '\n')
- {
- return from + 1;
- }
- else
- {
- return from;
- }
- }
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/util/ParameterList.cs b/CSJ2K/j2k/util/ParameterList.cs
deleted file mode 100644
index 03903829..00000000
--- a/CSJ2K/j2k/util/ParameterList.cs
+++ /dev/null
@@ -1,578 +0,0 @@
-/*
-* CVS identifier:
-*
-* $Id: ParameterList.java,v 1.18 2001/07/17 16:21:35 grosbois Exp $
-*
-* Class: ParameterList
-*
-* Description: Class to hold parameters.
-*
-*
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-* */
-using System;
-namespace CSJ2K.j2k.util
-{
-
- /// This class holds modules options and parameters as they are provided to the
- /// encoder or the decoder. Each option and its associated parameters are
- /// stored as strings.
- ///
- /// This class is built on the standard Java Properties class. Consequently,
- /// it offers facilities to load and write parameters from/to a file. In the
- /// meantime, a ParameterList object can also handle default parameters for
- /// each option.
- ///
- /// Each parameter can be retrieved as a string or as an specific primitive
- /// type (int, float, etc).
- ///
- /// For more details see the Properties class.
- ///
- /// Note that this class does not support multiple occurrences of parameters
- /// (for a parameter name, only one value is possible). Also there is no
- /// particular order of the parameters.
- ///
- ///
- ///
- ///
- ///
- //UPGRADE_ISSUE: Class hierarchy differences between 'java.util.Properties' and 'System.Collections.Specialized.NameValueCollection' may cause compilation errors. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1186'"
- [Serializable]
- public class ParameterList : System.Collections.Specialized.NameValueCollection
- {
- // COVNERSION PROBLEM?
- private ParameterList defaults;
-
- /// Returns the default ParameterList.
- ///
- ///
- /// Default ParameterList
- ///
- ///
- virtual public ParameterList DefaultParameterList
- {
- get
- {
- //UPGRADE_ISSUE: Field 'java.util.Properties.defaults' was not converted. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1000_javautilPropertiesdefaults_f'"
- return (ParameterList)defaults;
- }
-
- }
-
- /// Constructs an empty ParameterList object. It can be later completed by
- /// adding elements one by one, by loading them from a file, or by
- /// initializing them from an argument string.
- ///
- ///
- //UPGRADE_TODO: Format of property file may need to be changed. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1089'"
- //UPGRADE_ISSUE: Class hierarchy differences between 'java.util.Properties' and 'System.Collections.Specialized.NameValueCollection' may cause compilation errors. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1186'"
- public ParameterList() : base()
- {
- }
-
- /// Constructs an empty ParameterList object with the provided default
- /// parameters. The list can be later updated by adding elements one by
- /// one, by loading them from a file, or by initializing them from an
- /// argument string.
- ///
- ///
- /// The defaults parameters
- ///
- ///
- //UPGRADE_TODO: Format of property file may need to be changed. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1089'"
- //UPGRADE_ISSUE: Class hierarchy differences between 'java.util.Properties' and 'System.Collections.Specialized.NameValueCollection' may cause compilation errors. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1186'"
- public ParameterList(ParameterList def) : base()
- {
- defaults = def;
- }
-
- /// Parses the parameters from an argument list, such as as the one in the
- /// command line, and integrates them in this parameter list.
- ///
- /// All options must be preceded by '-' and then followed by one or more
- /// words, which constitues the values. The name of the options constitute
- /// the name of the parameters. The only exception is for boolean options,
- /// in which case if they are preceded by '-' they will be turned on, and
- /// if preceded by '+' they will be turned off. The string value of a
- /// boolean option is "on" or "off". Note that the '-' and '+' characters
- /// can not precede any word which would be a value for an option unless
- /// they are numeric values (otherwise it would be considered as a boolean
- /// option). Note also that the name of an option can not start with a
- /// number.
- ///
- /// No option can appear more than once. If so happens an exception is
- /// thrown.
- ///
- /// For instance the string:
- ///
- /// "-Ffilters w5x3 -Wlev 5 -Qtype reversible
- ///
- ///
will create the following parameter list:
- ///
- ///
- /// Ffilers w5x3
- /// Wlev 5
- /// Qtype reversible
- ///
- ///
- ///
- /// The argument list.
- ///
- ///
- /// if there are invalid arguments in
- /// 'argv'
- ///
- ///
- public virtual void parseArgs(System.String[] argv)
- {
- int k;
- char c, c2;
- System.String pname;
- System.Text.StringBuilder pvalue;
-
- // Read options
- k = -1;
- // Skip empty arguments
- do
- {
- k++;
- if (k >= argv.Length)
- {
- // Nothing to put in parameters
- return;
- }
- }
- while (argv[k].Length <= 0);
-
- // Check that we start with an option and that its is not a number
- c = argv[k][0];
- if (c != '-' && c != '+')
- {
- // It's not an option
- throw new StringFormatException("Argument list does not" + " start with an option: " + argv[k]);
- }
- if (argv[k].Length >= 2 && System.Char.IsDigit(argv[k][1]))
- {
- throw new StringFormatException("Numeric option name: " + argv[k]);
- }
- pvalue = new System.Text.StringBuilder();
- while (k < argv.Length)
- {
- // Read parameter name
- if (argv[k].Length <= 1)
- {
- throw new StringFormatException("Option \"" + argv[k] + "\" is too short.");
- }
- c = argv[k][0];
- pname = argv[k++];
- pvalue.Length = 0;
- // Are there any more arguments?
- if (k >= argv.Length)
- {
- // No more words in argument list => must be boolean
- pvalue.Append((c == '-') ? "on" : "off");
- }
- else
- {
- c2 = argv[k][0];
- // Is next word an option or a value?
- if (c2 == '-' || c2 == '+')
- {
- // Next word could be an option
- if (argv[k].Length <= 1)
- {
- throw new StringFormatException("Option or argument \"" + argv[k] + "\" too short");
- }
- if (!System.Char.IsDigit(argv[k][1]))
- {
- // Not a number => we have a boolean option in pname
- pvalue.Append((c == '-') ? "on" : "off");
- }
- }
- if (pvalue.Length == 0)
- {
- // No value yet
- // It should not a boolean option, read the values
- if (c == '+')
- {
- throw new StringFormatException("Boolean option \"" + pname + "\" has a value");
- }
- // We have at least one value
- pvalue.Append(argv[k++]);
- while (k < argv.Length)
- {
- // If empty string skip it
- if (argv[k].Length == 0)
- {
- k++;
- continue;
- }
- c = argv[k][0];
- if (c == '-' || c == '+')
- {
- // Next word could be an option
- if (argv[k].Length <= 1)
- {
- throw new StringFormatException("Option or " + "argument \"" + argv[k] + "\" too short");
- }
- if (!System.Char.IsDigit(argv[k][1]))
- {
- // It's an option => stop
- break;
- }
- }
- pvalue.Append(' '); // Add a space
- pvalue.Append(argv[k++]);
- }
- }
- }
- // Now put parameter and value in the list
- /*
- if (this[(System.String) pname.Substring(1)] != null)
- {
- // Option is repeated => ERROR
- throw new StringFormatException("Option \"" + pname + "\" appears more than once");
- }
- */
- System.Object tempObject;
- //UPGRADE_WARNING: At least one expression was used more than once in the target code. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1181'"
- tempObject = this[(System.String)pname.Substring(1)];
- this[(System.String)pname.Substring(1)] = (System.String)pvalue.ToString();
- System.Object generatedAux4 = tempObject;
- }
- }
-
- /// Returns the value of the named parameter, as a string. The value can
- /// come from teh defaults, if there are.
- ///
- ///
- /// The parameter name.
- ///
- ///
- /// the value of the parameter as a string, or null if there is no
- /// parameter with the name 'pname'.
- ///
- ///
- public virtual System.String getParameter(System.String pname)
- {
- System.String pval;
-
- pval = ((System.String)this[(System.String)pname]);
- //UPGRADE_ISSUE: Field 'java.util.Properties.defaults' was not converted. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1000_javautilPropertiesdefaults_f'"
- if (pval == null && defaults != null)
- {
- // if parameter is not there
- // Look in defaults
- //UPGRADE_ISSUE: Field 'java.util.Properties.defaults' was not converted. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1000_javautilPropertiesdefaults_f'"
- pval = defaults.Get(pname);
- }
- return pval;
- }
-
- /// Returns the value of the named parameter as a boolean. The value "on"
- /// is interpreted as 'true', while the value "off" is interpreted as
- /// 'false'. If the parameter has another value then an
- /// StringFormatException is thrown. If the parameter 'pname' is not in the
- /// parameter list, an IllegalArgumentException is thrown.
- ///
- ///
- /// The parameter name.
- ///
- ///
- /// the value of the parameter as a boolean.
- ///
- ///
- /// If the parameter has a value which is
- /// neither "on" nor "off".
- ///
- ///
- /// If there is no parameter with the
- /// name 'pname' in the parameter list.
- ///
- ///
- public virtual bool getBooleanParameter(System.String pname)
- {
- System.String s = (System.String)getParameter(pname);
-
- if (s == null)
- {
- throw new System.ArgumentException("No parameter with name " + pname);
- }
- else if (s.Equals("on"))
- {
- return true;
- }
- else if (s.Equals("off"))
- {
- return false;
- }
- else
- {
- throw new StringFormatException("Parameter \"" + pname + "\" is not boolean: " + s);
- }
- }
-
- /// Returns the value of the named parameter as an int. If the parameter
- /// has a non-numeric value a NumberFormatException is thrown. If the
- /// parameter has a multiple word value than the first word is returned as
- /// an int, others are ignored. If the parameter 'pname' is not in the
- /// parameter list, an IllegalArgumentException is thrown.
- ///
- ///
- /// The parameter name.
- ///
- ///
- /// the value of the parameter as an int.
- ///
- ///
- /// If the parameter has a non-numeric
- /// value.
- ///
- ///
- /// If there is no parameter with the
- /// name 'pname' in the parameter list.
- ///
- ///
- public virtual int getIntParameter(System.String pname)
- {
- System.String s = (System.String)getParameter(pname);
-
- if (s == null)
- {
- throw new System.ArgumentException("No parameter with name " + pname);
- }
- else
- {
- try
- {
- return System.Int32.Parse(s);
- }
- catch (System.FormatException e)
- {
- //UPGRADE_TODO: The equivalent in .NET for method 'java.lang.Throwable.getMessage' may return a different value. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1043'"
- throw new System.FormatException("Parameter \"" + pname + "\" is not integer: " + e.Message);
- }
- }
- }
-
- /// Returns the value of the named parameter as a float. If the parameter
- /// has a non-numeric value a NumberFormatException is thrown. If the
- /// parameter has a multiple word value than the first word is returned as
- /// an int, others are ignored. If the parameter 'pname' is not in the
- /// parameter list, an IllegalArgumentException is thrown.
- ///
- ///
- /// The parameter name.
- ///
- ///
- /// If the parameter has a non-numeric
- /// value.
- ///
- ///
- /// If there is no parameter with the
- /// name 'pname' in the parameter list.
- ///
- ///
- /// the value of the parameter as a float.
- ///
- ///
- public virtual float getFloatParameter(System.String pname)
- {
- System.String s = (System.String)getParameter(pname);
-
- if (s == null)
- {
- throw new System.ArgumentException("No parameter with name " + pname);
- }
- else
- {
- try
- {
- // Unfortunately there is no method to convert from a string
- // directly to a float
- //UPGRADE_TODO: The equivalent in .NET for method 'java.lang.Float.floatValue' may return a different value. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1043'"
- //UPGRADE_WARNING: Data types in Visual C# might be different. Verify the accuracy of narrowing conversions. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1042'"
- return (float)(System.Single.Parse(s));
- }
- catch (System.FormatException e)
- {
- //UPGRADE_TODO: The equivalent in .NET for method 'java.lang.Throwable.getMessage' may return a different value. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1043'"
- throw new System.FormatException("Parameter \"" + pname + "\" is not floating-point: " + e.Message);
- }
- }
- }
-
- /// Checks if the parameters which name starts with the prefix 'prfx' in
- /// the parameter list are all in the list of valid parameter names
- /// 'plist'. If there is a parameter that is not in 'plist' an
- /// IllegalArgumentException is thrown with an explanation message. The
- /// default parameters are also included in the check.
- ///
- ///
- /// The prefix of parameters to check.
- ///
- ///
- /// The list of valid parameter names for the 'prfx'
- /// prefix. If null it is considered that no names are valid.
- ///
- ///
- /// If there's a parameter name
- /// starting with 'prfx' which is not in the valid list of parameter names.
- ///
- ///
- public virtual void checkList(char prfx, System.String[] plist)
- {
- System.Collections.IEnumerator args;
- System.String val;
- int i;
- bool isvalid;
-
- args = Keys.GetEnumerator();
-
- //UPGRADE_TODO: Method 'java.util.Enumeration.hasMoreElements' was converted to 'System.Collections.IEnumerator.MoveNext' which has a different behavior. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1073_javautilEnumerationhasMoreElements'"
- while (args.MoveNext())
- {
- //UPGRADE_TODO: Method 'java.util.Enumeration.nextElement' was converted to 'System.Collections.IEnumerator.Current' which has a different behavior. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1073_javautilEnumerationnextElement'"
- val = ((System.String)args.Current);
- if (val.Length > 0 && val[0] == prfx)
- {
- isvalid = false;
- if (plist != null)
- {
- for (i = plist.Length - 1; i >= 0; i--)
- {
- if (val.Equals(plist[i]))
- {
- isvalid = true;
- break;
- }
- }
- }
- if (!isvalid)
- {
- // Did not find valid flag
- throw new System.ArgumentException("Option '" + val + "' is " + "not a valid one.");
- }
- }
- }
- }
-
- /// Checks if the parameters which names do not start with any of the
- /// prefixes in 'prfxs' in this ParameterList are all in the list of valid
- /// parameter names 'plist'. If there is a parameter that is not in 'plist'
- /// an IllegalArgumentException is thrown with an explanation message. The
- /// default parameters are also included in the check.
- ///
- ///
- /// The prefixes of parameters to ignore.
- ///
- ///
- /// The list of valid parameter names. If null it is
- /// considered that no names are valid.
- ///
- ///
- /// If there's a parameter name not
- /// starting with 'prfx' which is not in the valid list of parameter names.
- ///
- ///
- public virtual void checkList(char[] prfxs, System.String[] plist)
- {
- System.Collections.IEnumerator args;
- System.String val, strprfxs;
- int i;
- bool isvalid;
-
- args = Keys.GetEnumerator();
- strprfxs = new System.String(prfxs);
-
- //UPGRADE_TODO: Method 'java.util.Enumeration.hasMoreElements' was converted to 'System.Collections.IEnumerator.MoveNext' which has a different behavior. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1073_javautilEnumerationhasMoreElements'"
- while (args.MoveNext())
- {
- //UPGRADE_TODO: Method 'java.util.Enumeration.nextElement' was converted to 'System.Collections.IEnumerator.Current' which has a different behavior. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1073_javautilEnumerationnextElement'"
- val = ((System.String)args.Current);
- if (val.Length > 0 && strprfxs.IndexOf((System.Char)val[0]) == -1)
- {
- isvalid = false;
- if (plist != null)
- {
- for (i = plist.Length - 1; i >= 0; i--)
- {
- if (val.Equals(plist[i]))
- {
- isvalid = true;
- break;
- }
- }
- }
- if (!isvalid)
- {
- throw new System.ArgumentException("Option '" + val + "' is " + "not a valid one.");
- }
- }
- }
- }
-
- /// Converts the usage information to a list of parameter names in a single
- /// array. The usage information appears in a 2D array of String. The first
- /// dimensions contains the different options, the second dimension
- /// contains the name of the option (first element), the synopsis and the
- /// explanation. This method takes the names of the different options in
- /// 'pinfo' and returns them in a single array of String.
- ///
- ///
- /// The list of options and their usage info (see above).
- ///
- ///
- /// An array with the names of the options in pinfo. If pinfo is
- /// null, null is returned.
- ///
- ///
- public static System.String[] toNameArray(System.String[][] pinfo)
- {
- System.String[] pnames;
-
- if (pinfo == null)
- {
- return null;
- }
-
- pnames = new System.String[pinfo.Length];
-
- for (int i = pinfo.Length - 1; i >= 0; i--)
- {
- pnames[i] = pinfo[i][0];
- }
- return pnames;
- }
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/util/ProgressWatch.cs b/CSJ2K/j2k/util/ProgressWatch.cs
deleted file mode 100644
index 137024de..00000000
--- a/CSJ2K/j2k/util/ProgressWatch.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
-* CVS identifier:
-*
-* $Id: ProgressWatch.java,v 1.1 2002/05/22 16:19:28 grosbois Exp $
-*
-* Class: ProgressWatch
-*
-* Description: Interface defining methods for ProgressWatch objects.
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-* */
-namespace CSJ2K.j2k.util
-{
-
- public interface ProgressWatch
- {
- /// Initialize the progress watching process
- ///
- ///
- void initProgressWatch(int min, int max, System.String info);
-
- /// Update the progress watching process to the specified value
- ///
- ///
- void updateProgressWatch(int val, System.String info);
-
- /// Terminate the progress watch process
- ///
- ///
- void terminateProgressWatch();
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/util/StreamMsgLogger.cs b/CSJ2K/j2k/util/StreamMsgLogger.cs
deleted file mode 100644
index e793352d..00000000
--- a/CSJ2K/j2k/util/StreamMsgLogger.cs
+++ /dev/null
@@ -1,243 +0,0 @@
-/*
-* CVS identifier:
-*
-* $Id: StreamMsgLogger.java,v 1.11 2000/09/05 09:25:30 grosbois Exp $
-*
-* Class: StreamMsgLogger
-*
-* Description: Implementation of MsgLogger for streams
-*
-*
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-*
-*
-*
-*/
-namespace CSJ2K.j2k.util
-{
-
- /// This class implements the MsgLogger interface for streams. Streams can
- /// be simple files, terminals, stdout, stderr, etc. The messages or simple
- /// strings are formatted using the linewidth given to the constructor.
- ///
- /// Messages are printed to the 'err' stream if they are of severity WARNING
- /// or ERROR, otherwise they are printed to the 'out' stream. Simple strings
- /// are always printed the 'out' stream.
- ///
- ///
- public class StreamMsgLogger : MsgLogger
- {
-
- /// The 'out' stream
- private System.IO.StreamWriter out_Renamed;
-
- /// The 'err' stream
- private System.IO.StreamWriter err;
-
- /// The printer that formats the text
- private MsgPrinter mp;
-
- /// Constructs a StreamMsgLogger that uses 'outstr' as the 'out' stream,
- /// and 'errstr' as the 'err' stream. Note that 'outstr' and 'errstr' can
- /// be System.out and System.err.
- ///
- ///
- /// Where to print simple strings and LOG and INFO messages.
- ///
- ///
- /// Where to print WARNING and ERROR messages
- ///
- ///
- /// The line width to use in formatting
- ///
- ///
- ///
- ///
- public StreamMsgLogger(System.IO.Stream outstr, System.IO.Stream errstr, int lw)
- {
- System.IO.StreamWriter temp_writer;
- temp_writer = new System.IO.StreamWriter(outstr, System.Text.Encoding.Default);
- temp_writer.AutoFlush = true;
- out_Renamed = temp_writer;
- System.IO.StreamWriter temp_writer2;
- temp_writer2 = new System.IO.StreamWriter(errstr, System.Text.Encoding.Default);
- temp_writer2.AutoFlush = true;
- err = temp_writer2;
- mp = new MsgPrinter(lw);
- }
-
- /// Constructs a StreamMsgLogger that uses 'outstr' as the 'out' stream,
- /// and 'errstr' as the 'err' stream. Note that 'outstr' and 'errstr' can
- /// be System.out and System.err.
- ///
- ///
- /// Where to print simple strings and LOG and INFO messages.
- ///
- ///
- /// Where to print WARNING and ERROR messages
- ///
- ///
- /// The line width to use in formatting
- ///
- ///
- ///
- ///
- //UPGRADE_ISSUE: Class hierarchy differences between 'java.io.Writer' and 'System.IO.StreamWriter' may cause compilation errors. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1186'"
- public StreamMsgLogger(System.IO.StreamWriter outstr, System.IO.StreamWriter errstr, int lw)
- {
- System.IO.StreamWriter temp_writer;
- temp_writer = new System.IO.StreamWriter(outstr.BaseStream, outstr.Encoding);
- temp_writer.AutoFlush = true;
- out_Renamed = temp_writer;
- System.IO.StreamWriter temp_writer2;
- temp_writer2 = new System.IO.StreamWriter(errstr.BaseStream, errstr.Encoding);
- temp_writer2.AutoFlush = true;
- err = temp_writer2;
- mp = new MsgPrinter(lw);
- }
-
- /// Constructs a StreamMsgLogger that uses 'outstr' as the 'out' stream,
- /// and 'errstr' as the 'err' stream. Note that 'outstr' and 'errstr' can
- /// be System.out and System.err.
- ///
- ///
- /// Where to print simple strings and LOG and INFO messages.
- ///
- ///
- /// Where to print WARNING and ERROR messages
- ///
- ///
- /// The line width to use in formatting
- ///
- ///
- ///
- ///
- ///
- /*
- public StreamMsgLogger(System.IO.StreamWriter outstr, System.IO.StreamWriter errstr, int lw)
- {
- out_Renamed = outstr;
- err = errstr;
- mp = new MsgPrinter(lw);
- }
- */
- /// Prints the message 'msg' to the output device, appending a newline,
- /// with severity 'sev'. The severity of the message is prepended to the
- /// message.
- ///
- ///
- /// The message severity (LOG, INFO, etc.)
- ///
- ///
- /// The message to display
- ///
- ///
- ///
- ///
- public virtual void printmsg(int sev, System.String msg)
- {
- System.IO.StreamWriter lout;
- //int ind;
- System.String prefix;
-
- switch (sev)
- {
-
- case CSJ2K.j2k.util.MsgLogger_Fields.LOG:
- prefix = "[LOG]: ";
- lout = out_Renamed;
- break;
-
- case CSJ2K.j2k.util.MsgLogger_Fields.INFO:
- prefix = "[INFO]: ";
- lout = out_Renamed;
- break;
-
- case CSJ2K.j2k.util.MsgLogger_Fields.WARNING:
- prefix = "[WARNING]: ";
- lout = err;
- break;
-
- case CSJ2K.j2k.util.MsgLogger_Fields.ERROR:
- prefix = "[ERROR]: ";
- lout = err;
- break;
-
- default:
- throw new System.ArgumentException("Severity " + sev + " not valid.");
-
- }
-
- mp.print(lout, 0, prefix.Length, prefix + msg);
- lout.Flush();
- }
-
- /// Prints the string 'str' to the 'out' stream, appending a newline. The
- /// message is reformatted to the line width given to the constructors and
- /// using 'flind' characters to indent the first line and 'ind' characters
- /// to indent the second line. However, any newlines appearing in 'str' are
- /// respected. The output device may or may not display the string until
- /// flush() is called, depending on the autoflush state of the PrintWriter,
- /// to be sure flush() should be called to write the string to the
- /// device. This method just prints the string, the string does not make
- /// part of a "message" in the sense that noe severity is associated to it.
- ///
- ///
- /// The string to print
- ///
- ///
- /// Indentation of the first line
- ///
- ///
- /// Indentation of any other lines.
- ///
- ///
- ///
- ///
- public virtual void println(System.String str, int flind, int ind)
- {
- mp.print(out_Renamed, flind, ind, str);
- }
-
- /// Writes any buffered data from the print() and println() methods to the
- /// device.
- ///
- ///
- ///
- ///
- public virtual void flush()
- {
- out_Renamed.Flush();
- }
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/util/StringFormatException.cs b/CSJ2K/j2k/util/StringFormatException.cs
deleted file mode 100644
index c09391e1..00000000
--- a/CSJ2K/j2k/util/StringFormatException.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
-* CVS identifier:
-*
-* $Id: StringFormatException.java,v 1.9 2000/09/05 09:25:31 grosbois Exp $
-*
-* Class: ArgumentFormatException
-*
-* Description: Exception for badly formatted string
-* argument exceptions.
-*
-*
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-*
-*
-*
-*/
-using System;
-namespace CSJ2K.j2k.util
-{
-
- /// Thrown to indicate that the application has attempted to parse a
- /// badly formatted string.
- ///
- ///
- [Serializable]
- public class StringFormatException : System.ArgumentException
- {
-
- /// Creates the exception with an empty messgage.
- ///
- ///
- ///
- ///
- public StringFormatException() : base()
- {
- }
-
- /// Creates the exception with the specified detail message.
- ///
- ///
- /// The detail message
- ///
- ///
- ///
- ///
- public StringFormatException(System.String s) : base(s)
- {
- }
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/util/ThreadPool.cs b/CSJ2K/j2k/util/ThreadPool.cs
deleted file mode 100644
index fdcc3602..00000000
--- a/CSJ2K/j2k/util/ThreadPool.cs
+++ /dev/null
@@ -1,647 +0,0 @@
-/*
-* CVS identifier:
-*
-* $Id: ThreadPool.java,v 1.9 2002/05/22 15:00:55 grosbois Exp $
-*
-* Class: ThreadPool
-*
-* Description: A pool of threads
-*
-*
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-* */
-namespace CSJ2K.j2k.util
-{
-
- /// This class implements a thread pool. The thread pool contains a set of
- /// threads which can be given work to do.
- ///
- /// If the Java Virtual Machine (JVM) uses native threads, then the
- /// different threads will be able to execute in different processors in
- /// parallel on multiprocessors machines. However, under some JVMs and
- /// operating systems using native threads is not sufficient to allow the JVM
- /// access to multiple processors. This is the case when native threads are
- /// implemented using POSIX threads on lightweight processes
- /// (i.e. PTHREAD_SCOPE_PROCESS sopce scheduling), which is the case on most
- /// UNIX operating systems. In order to do provide access to multiple
- /// processors it is necessary to set the concurrency level to the number of
- /// processors or slightly higher. This can be achieved by setting the Java
- /// system property with the name defined by CONCURRENCY_PROP_NAME to some
- /// non-negative number. This will make use of the 'NativeServices' class and
- /// supporting native libraries. See 'NativeServices' for details. See
- /// 'CONCURRENCY_PROP_NAME' for the name of the property.
- ///
- ///
Initially the thread pool contains a user specified number of idle
- /// threads. Idle threads can be given a target which is run. While running the
- /// target the thread temporarily leaves the idle list. When the target
- /// finishes, it joins the idle list again, waiting for a new target. When a
- /// target is finished a thread can be notified on a particular object that is
- /// given as a lock.
- ///
- ///
Jobs can be submitted using Runnable interfaces, using the 'runTarget()'
- /// methods. When the job is submitted, an idle thread will be obtained, the
- /// 'run()' method of the 'Runnable' interface will be executed and when it
- /// completes the thread will be returned to the idle list. In general the
- /// 'run()' method should complete in a rather short time, so that the threds
- /// of the pool are not starved.
- ///
- ///
If using the non-asynchronous calls to 'runTarget()', it is important
- /// that any target's 'run()' method, or any method called from it, does not
- /// use non-asynchronous calls to 'runTarget()' on the same thread pool where
- /// it was started. Otherwise this could create a dead-lock when there are not
- /// enough idle threads.
- ///
- ///
The pool also has a global error and runtime exception condition (one
- /// for 'Error' and one for 'RuntimeException'). If a target's 'run()' method
- /// throws an 'Error' or 'RuntimeException' the corresponding exception
- /// condition is set and the exception object saved. In any subsequent call to
- /// 'checkTargetErrors()' the saved exception object is thrown. Likewise, if a
- /// target's 'run()' method throws any other subclass of 'Throwable' a new
- /// 'RuntimeException' is created and saved. It will be thrown on a subsequent
- /// call to 'checkTargetErrors()'. If more than one exception occurs between
- /// calls to 'checkTargetErrors()' only the last one is saved. Any 'Error'
- /// condition has precedence on all 'RuntimeException' conditions. The threads
- /// in the pool are unaffected by any exceptions thrown by targets.
- ///
- ///
The only exception to the above is the 'ThreadDeath' exception. If a
- /// target's 'run()' method throws the 'ThreadDeath' exception a warning
- /// message is printed and the exception is propagated, which will terminate
- /// the thread in which it occurs. This could lead to instabilities of the
- /// pool. The 'ThreadDeath' exception should never be thrown by the program. It
- /// is thrown by the Java(TM) Virtual Machine when Thread.stop() is
- /// called. This method is deprecated and should never be called.
- ///
- ///
All the threads in the pool are "daemon" threads and will automatically
- /// terminate when no daemon threads are running.
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public class ThreadPool
- {
- /// Returns the size of the pool. That is the number of threads in this
- /// pool (idle + busy).
- ///
- ///
- /// The pool's size.
- ///
- ///
- ///
- virtual public int Size
- {
- get
- {
- return idle.Length;
- }
-
- }
-
- /// The name of the property that sets the concurrency level:
- /// jj2000.j2k.util.ThreadPool.concurrency
- ///
- public const System.String CONCURRENCY_PROP_NAME = "jj2000.j2k.util.ThreadPool.concurrency";
-
- /// The array of idle threads and the lock for the manipulation of the
- /// idle thread list.
- ///
- private ThreadPoolThread[] idle;
-
- /// The number of idle threads
- private int nidle;
-
- /// The name of the pool
- private System.String poolName;
-
- /// The priority for the pool
- private int poolPriority;
-
- /// The last error thrown by a target. Null if none
- // NOTE: needs to be volatile, so that only one copy exits in memory
- private volatile System.ApplicationException targetE;
-
- /// The last runtime exception thrown by a target. Null if none
- // NOTE: needs to be volatile, so that only one copy exits in memory
- private volatile System.SystemException targetRE;
-
- //UPGRADE_NOTE: Field 'EnclosingInstance' was added to class 'ThreadPoolThread' to access its enclosing instance. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1019'"
- /// The threads that are managed by the pool.
- ///
- ///
- internal class ThreadPoolThread : SupportClass.ThreadClass
- {
- private void InitBlock(ThreadPool enclosingInstance)
- {
- this.enclosingInstance = enclosingInstance;
- }
- private ThreadPool enclosingInstance;
- public ThreadPool Enclosing_Instance
- {
- get
- {
- return enclosingInstance;
- }
-
- }
- private IThreadRunnable target;
- private System.Object lock_Renamed;
- private bool doNotifyAll;
-
- /// Creates a ThreadPoolThread object, setting its name according to
- /// the given 'idx', daemon type and the priority to the one of the
- /// pool.
- ///
- ///
- /// The index of this thread in the pool
- ///
- ///
- /// The name of the thread
- ///
- ///
- public ThreadPoolThread(ThreadPool enclosingInstance, int idx, System.String name) : base(name)
- {
- InitBlock(enclosingInstance);
- IsBackground = true;
- //UPGRADE_TODO: The differences in the type of parameters for method 'java.lang.Thread.setPriority' may cause compilation errors. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1092'"
- Priority = (System.Threading.ThreadPriority)Enclosing_Instance.poolPriority;
- }
-
- /// The method that is run by the thread. This method first joins the
- /// idle state in the pool and then enters an infinite loop. In this
- /// loop it waits until a target to run exists and runs it. Once the
- /// target's run() method is done it re-joins the idle state and
- /// notifies the waiting lock object, if one exists.
- ///
- /// An interrupt on this thread has no effect other than forcing a
- /// check on the target. Normally the target is checked every time the
- /// thread is woken up by notify, no interrupts should be done.
- ///
- ///
Any exception thrown by the target's 'run()' method is catched
- /// and this thread is not affected, except for 'ThreadDeath'. If a
- /// 'ThreadDeath' exception is catched a warning message is printed by
- /// the 'FacilityManager' and the exception is propagated up. For
- /// exceptions which are subclasses of 'Error' or 'RuntimeException'
- /// the corresponding error condition is set and this thread is not
- /// affected. For any other exceptions a new 'RuntimeException' is
- /// created and the error condition is set, this thread is not affected.
- ///
- ///
- override public void Run()
- {
- // Join the idle threads list
- Enclosing_Instance.putInIdleList(this);
- // Permanently lock the object while running so that target can
- // not be changed until we are waiting again. While waiting for a
- // target the lock is released.
- lock (this)
- {
- while (true)
- {
- // Wait until we get a target
- while (target == null)
- {
- try
- {
- System.Threading.Monitor.Wait(this);
- }
- catch (System.Threading.ThreadInterruptedException)
- {
- }
- }
- // Run the target and catch all possible errors
- try
- {
- target.Run();
- }
- //UPGRADE_NOTE: Exception 'java.lang.ThreadDeath' was converted to 'System.ApplicationException' which has different behavior. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1100'"
- catch (System.Threading.ThreadAbortException td)
- {
- // We have been instructed to abruptly terminate
- // the thread, which should never be done. This can
- // cause another thread, or the system, to lock.
- FacilityManager.getMsgLogger().printmsg(CSJ2K.j2k.util.MsgLogger_Fields.WARNING, "Thread.stop() called on a ThreadPool " + "thread or ThreadDeath thrown. This is " + "deprecated. Lock-up might occur.");
- throw td;
- }
- catch (System.ApplicationException e)
- {
- Enclosing_Instance.targetE = e;
- }
- catch (System.SystemException re)
- {
- Enclosing_Instance.targetRE = re;
- }
- //UPGRADE_NOTE: Exception 'java.lang.Throwable' was converted to 'System.Exception' which has different behavior. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1100'"
- catch (System.Exception)
- {
- // A totally unexpected error has occurred
- // (Thread.stop(Throwable) has been used, which should
- // never be.
- Enclosing_Instance.targetRE = new System.SystemException("Unchecked exception " + "thrown by target's " + "run() method in pool " + Enclosing_Instance.poolName + ".");
- }
- // Join idle threads
- Enclosing_Instance.putInIdleList(this);
- // Release the target and notify lock (i.e. wakeup)
- target = null;
- if (lock_Renamed != null)
- {
- lock (lock_Renamed)
- {
- if (doNotifyAll)
- {
- System.Threading.Monitor.PulseAll(lock_Renamed);
- }
- else
- {
- System.Threading.Monitor.Pulse(lock_Renamed);
- }
- }
- }
- }
- }
- }
-
- /// Assigns a target to this thread, with an optional notify lock and a
- /// notify mode. The another target is currently running the method
- /// will block until it terminates. After setting the new target the
- /// runner thread will be wakenup and execytion will start.
- ///
- ///
- /// The runnable object containing the 'run()' method to
- /// run.
- ///
- ///
- /// An object on which notify will be called once the
- /// target's run method has finished. A thread to be notified should be
- /// waiting on that object. If null no thread is notified.
- ///
- ///
- /// If true 'notifyAll()', instead of 'notify()', will
- /// be called on tghe lock.
- ///
- ///
- //UPGRADE_NOTE: Synchronized keyword was removed from method 'setTarget'. Lock expression was added. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1027'"
- internal virtual void setTarget(IThreadRunnable target, System.Object lock_Renamed, bool notifyAll)
- {
- lock (this)
- {
- // Set the target
- this.target = target;
- this.lock_Renamed = lock_Renamed;
- doNotifyAll = notifyAll;
- // Wakeup the thread
- System.Threading.Monitor.Pulse(this);
- }
- }
- }
-
- /// Creates a new thread pool of the given size, thread priority and pool
- /// name.
- ///
- /// If the Java system property of the name defined by
- /// 'CONCURRENCY_PROP_NAME' is set, then an attempt will be made to load
- /// the library that supports concurrency setting (see
- /// 'NativeServices'). If that succeds the concurrency level will be set to
- /// the specified value. Otherwise a warning is printed.
- ///
- ///
- /// The size of the pool (number of threads to create in the
- /// pool).
- ///
- ///
- /// The priority to give to the threads in the pool. If
- /// less than 'Thread.MIN_PRIORITY' it will be the same as the priority of
- /// the calling thread.
- ///
- ///
- /// The name of the pool. If null a default generic name is
- /// chosen.
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public ThreadPool(int size, int priority, System.String name)
- {
- int i;
- ThreadPoolThread t;
- //System.String prop;
- //int clevel;
-
- // Initialize variables checking for special cases
- if (size <= 0)
- {
- throw new System.ArgumentException("Pool must be of positive size");
- }
- if (priority < (int)System.Threading.ThreadPriority.Lowest)
- {
- poolPriority = (System.Int32)SupportClass.ThreadClass.Current().Priority;
- }
- else
- {
- poolPriority = (priority < (int)System.Threading.ThreadPriority.Highest) ? priority : (int)System.Threading.ThreadPriority.Highest;
- }
- if (name == null)
- {
- poolName = "Anonymous ThreadPool";
- }
- else
- {
- poolName = name;
- }
-
- // Allocate internal variables
- idle = new ThreadPoolThread[size];
- nidle = 0;
-
- // Create and start the threads
- for (i = 0; i < size; i++)
- {
- t = new ThreadPoolThread(this, i, poolName + "-" + i);
- t.Start();
- }
- }
-
- /// Runs the run method of the specified target in an idle thread of this
- /// pool. When the target's run method completes, the thread waiting on the
- /// lock object is notified, if any. If there is currently no idle thread
- /// the method will block until a thread of the pool becomes idle or the
- /// calling thread is interrupted.
- ///
- /// This method is the same as runTarget(t,l,true,false).
- ///
- ///
- /// The target. The 'run()' method of this object will be run in
- /// an idle thread of the pool.
- ///
- ///
- /// The lock object. A thread waiting on the lock of the 'l'
- /// object will be notified, through the 'notify()' call, when the target's
- /// run method completes. If null no thread is notified.
- ///
- ///
- /// True if the target was submitted to some thread. False if no
- /// idle thread could be found and the target was not submitted for
- /// execution.
- ///
- ///
- ///
- public virtual bool runTarget(IThreadRunnable t, System.Object l)
- {
- return runTarget(t, l, false, false);
- }
-
- /// Runs the run method of the specified target in an idle thread of this
- /// pool. When the target's run method completes, the thread waiting on the
- /// lock object is notified, if any. If there is currently no idle thread
- /// and the asynchronous mode is not used the method will block until a
- /// thread of the pool becomes idle or the calling thread is
- /// interrupted. If the asynchronous mode is used then the method will not
- /// block and will return false.
- ///
- /// This method is the same as runTarget(t,l,async,false).
- ///
- ///
- /// The target. The 'run()' method of this object will be run in
- /// an idle thread of the pool.
- ///
- ///
- /// The lock object. A thread waiting on the lock of the 'l'
- /// object will be notified, through the 'notify()' call, when the target's
- /// run method completes. If null no thread is notified.
- ///
- ///
- /// If true the asynchronous mode will be used.
- ///
- ///
- /// True if the target was submitted to some thread. False if no
- /// idle thread could be found and the target was not submitted for
- /// execution.
- ///
- ///
- ///
- public virtual bool runTarget(IThreadRunnable t, System.Object l, bool async)
- {
- return runTarget(t, l, async, false);
- }
-
- /// Runs the run method of the specified target in an idle thread of this
- /// pool. When the target's run method completes, the thread waiting on the
- /// lock object is notified, if any. If there is currently no idle thread
- /// and the asynchronous mode is not used the method will block until a
- /// thread of the pool becomes idle or the calling thread is
- /// interrupted. If the asynchronous mode is used then the method will not
- /// block and will return false.
- ///
- ///
- /// The target. The 'run()' method of this object will be run in
- /// an idle thread of the pool.
- ///
- ///
- /// The lock object. A thread waiting on the lock of the 'l'
- /// object will be notified, through the 'notify()' call, when the target's
- /// run method completes. If null no thread is notified.
- ///
- ///
- /// If true the asynchronous mode will be used.
- ///
- ///
- /// If true, threads waiting on the lock of the 'l' object
- /// will be notified trough the 'notifyAll()' instead of the normal
- /// 'notify()' call. This is not normally needed.
- ///
- ///
- /// True if the target was submitted to some thread. False if no
- /// idle thread could be found and the target was not submitted for
- /// execution.
- ///
- ///
- ///
- public virtual bool runTarget(IThreadRunnable t, System.Object l, bool async, bool notifyAll)
- {
- ThreadPoolThread runner; // The thread to run the target
-
- // Get a thread to run
- runner = getIdle(async);
- // If no runner return failure
- if (runner == null)
- return false;
- // Set the runner
- runner.setTarget(t, l, notifyAll);
- return true;
- }
-
- /// Checks that no error or runtime exception in any target have occurred
- /// so far. If an error or runtime exception has occurred in a target's run
- /// method they are thrown by this method.
- ///
- ///
- /// If an error condition has been thrown by a target
- /// 'run()' method.
- ///
- ///
- /// If a runtime exception has been thrown by a
- /// target 'run()' method.
- ///
- ///
- public virtual void checkTargetErrors()
- {
- // Check for Error
- if (targetE != null)
- throw targetE;
- // Check for RuntimeException
- if (targetRE != null)
- throw targetRE;
- }
-
- /// Clears the current target error conditions, if any. Note that a thread
- /// in the pool might have set the error conditions since the last check
- /// and that those error conditions will be lost. Likewise, before
- /// returning from this method another thread might set the error
- /// conditions. There is no guarantee that no error conditions exist when
- /// returning from this method.
- ///
- /// In order to ensure that no error conditions exist when returning
- /// from this method cooperation from the targets and the thread using this
- /// pool is necessary (i.e. currently no targets running or waiting to
- /// run).
- ///
- ///
- public virtual void clearTargetErrors()
- {
- // Clear the error and runtime exception conditions
- targetE = null;
- targetRE = null;
- }
-
- /// Puts the thread 't' in the idle list. The thread 't' should be in fact
- /// idle and ready to accept a new target when it joins the idle list.
- ///
- /// An idle thread that is already in the list should never add itself
- /// to the list before it is removed. For efficiency reasons there is no
- /// check to see if the thread is already in the list of idle threads.
- ///
- ///
If the idle list was empty 'notify()' will be called on the 'idle'
- /// array, to wake up a thread that might be waiting (within the
- /// 'getIdle()' method) on an idle thread to become available.
- ///
- ///
- /// The thread to put in the idle list.
- ///
- ///
- private void putInIdleList(ThreadPoolThread t)
- {
- // NOTE: if already in idle => catastrophe! (should be OK since //
- // this is private method)
- // Lock the idle array to avoid races with 'getIdle()'
- lock (idle)
- {
- idle[nidle] = t;
- nidle++;
- // If idle array was empty wakeup any waiting threads.
- if (nidle == 1)
- System.Threading.Monitor.Pulse(idle);
- }
- }
-
- /// Returns and idle thread and removes it from the list of idle
- /// threads. In asynchronous mode it will immediately return an idle
- /// thread, or null if none is available. In non-asynchronous mode it will
- /// block until a thread of the pool becomes idle or the calling thread is
- /// interrupted.
- ///
- /// If in non-asynchronous mode and there are currently no idle threads
- /// available the calling thread will wait on the 'idle' array lock, until
- /// notified by 'putInIdleList()' that an idle thread might have become
- /// available.
- ///
- ///
- /// If true asynchronous mode is used.
- ///
- ///
- /// An idle thread of the pool, that has been removed from the idle
- /// list, or null if none is available.
- ///
- ///
- private ThreadPoolThread getIdle(bool async)
- {
- // Lock the idle array to avoid races with 'putInIdleList()'
- lock (idle)
- {
- if (async)
- {
- // In asynchronous mode just return null if no idle thread
- if (nidle == 0)
- return null;
- }
- else
- {
- // In synchronous mode wait until a thread becomes idle
- while (nidle == 0)
- {
- try
- {
- System.Threading.Monitor.Wait(idle);
- }
- catch (System.Threading.ThreadInterruptedException)
- {
- // If we were interrupted just return null
- return null;
- }
- }
- }
- // Decrease the idle count and return one of the idle threads
- nidle--;
- return idle[nidle];
- }
- }
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/wavelet/FilterTypes.cs b/CSJ2K/j2k/wavelet/FilterTypes.cs
deleted file mode 100644
index cb6a1323..00000000
--- a/CSJ2K/j2k/wavelet/FilterTypes.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
-* CVS identifier:
-*
-* $Id: FilterTypes.java,v 1.12 2001/05/08 16:14:28 grosbois Exp $
-*
-* Class: FilterTypes
-*
-* Description: Defines the interface for Filter types
-*
-*
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-* */
-namespace CSJ2K.j2k.wavelet
-{
-
- /// This interface defines the identifiers for the different types of filters
- /// that are supported.
- ///
- /// The identifier values are the same as those used in the codestream
- /// syntax, for the filters that are defined in the standard.
- ///
- ///
- public struct FilterTypes_Fields
- {
- /// W7x9 filter: 0x00
- public const int W9X7 = 0;
- /// W5x3 filter: 0x01
- public const int W5X3 = 1;
- /// User-defined filter: -1
- public const int CUSTOM = -1;
- }
- public interface FilterTypes
- {
- //UPGRADE_NOTE: Members of interface 'FilterTypes' were extracted into structure 'FilterTypes_Fields'. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1045'"
-
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/wavelet/Subband.cs b/CSJ2K/j2k/wavelet/Subband.cs
deleted file mode 100644
index d859b300..00000000
--- a/CSJ2K/j2k/wavelet/Subband.cs
+++ /dev/null
@@ -1,642 +0,0 @@
-/*
-* CVS identifier:
-*
-* $Id: Subband.java,v 1.47 2001/10/18 14:27:14 grosbois Exp $
-*
-* Class: Subband
-*
-* Description: Asbtract element for a tree strcuture for
-* a description of subbands.
-*
-*
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-* */
-using CSJ2K.j2k.image;
-namespace CSJ2K.j2k.wavelet
-{
-
- /// This abstract class represents a subband in a bidirectional tree structure
- /// that describes the subband decomposition for a wavelet transform. This
- /// class is implemented by the SubbandAn and SubbandSyn classes, which are for
- /// the analysis and synthesis sides respectively.
- ///
- /// The element can be either a node or a leaf of the tree. If it is a node,
- /// it has 4 descendants (LL, HL, LH and HH). If it is a leaf, it has no
- /// descendant.
- ///
- /// The tree is bidirectional. Each element in the tree structure has a
- /// "parent", which is the subband from which the element was obtained by
- /// decomposition. The only exception is the root element which, for obvious
- /// reasons, has no parent (i.e. it is null).
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public abstract class Subband
- {
- /// Returns the parent of this subband. The parent of a subband is the
- /// subband from which this one was obtained by decomposition. The root
- /// element has no parent subband (null).
- ///
- ///
- /// The parent subband, or null for the root one.
- ///
- ///
- public abstract Subband Parent { get; }
- /// Returns the LL child subband of this subband.
- ///
- ///
- /// The LL child subband, or null if there are no childs.
- ///
- ///
- public abstract Subband LL { get; }
- /// Returns the HL (horizontal high-pass) child subband of this subband.
- ///
- ///
- /// The HL child subband, or null if there are no childs.
- ///
- ///
- public abstract Subband HL { get; }
- /// Returns the LH (vertical high-pass) child subband of this subband.
- ///
- ///
- /// The LH child subband, or null if there are no childs.
- ///
- ///
- public abstract Subband LH { get; }
- /// Returns the HH child subband of this subband.
- ///
- ///
- /// The HH child subband, or null if there are no childs.
- ///
- ///
- public abstract Subband HH { get; }
- /// Returns the first leaf subband element in the next higher resolution
- /// level.
- ///
- ///
- /// The first leaf element in the next higher resolution level, or
- /// null if there is no higher resolution level.
- ///
- ///
- virtual public Subband NextResLevel
- {
- get
- {
- Subband sb;
-
- if (level == 0)
- {
- // No higher res. level
- return null;
- }
- // Go up until we get to a different resolution level
- sb = this;
- do
- {
- sb = sb.Parent;
- if (sb == null)
- {
- // No higher resolution level
- return null;
- }
- }
- while (sb.resLvl == resLvl);
- // Now go down to HL, which is in next higher resolution level
- sb = sb.HL;
- // Now go down LL until get to a leaf
- while (sb.isNode)
- {
- sb = sb.LL;
- }
- return sb;
- }
-
- }
- /// This function returns the horizontal wavelet filter relevant to this
- /// subband
- ///
- ///
- /// The horizontal wavelet filter
- ///
- ///
- public abstract WaveletFilter HorWFilter { get; }
- /// This function returns the vertical wavelet filter relevant to this
- /// subband
- ///
- ///
- /// The vertical wavelet filter
- ///
- ///
- public abstract WaveletFilter VerWFilter { get; }
-
- /// The ID for the LL orientation
- public const int WT_ORIENT_LL = 0;
-
- /// The ID for the HL (horizontal high-pass) orientation
- public const int WT_ORIENT_HL = 1;
-
- /// The ID for the LH (vertical high-pass) orientation
- public const int WT_ORIENT_LH = 2;
-
- /// The ID for the HH orientation
- public const int WT_ORIENT_HH = 3;
-
- /// True if it is a node in the tree, false if it is a leaf.
- public bool isNode;
-
- /// The orientation of this subband (WT_ORIENT_LL, WT_ORIENT_HL,
- /// WT_ORIENT_LH, WT_ORIENT_HH).
- ///
- public int orientation;
-
- /// The level in the tree to which this subband belongs, which is the
- /// number of performed wavelet decompositions to get this subband. It is 0
- /// for the top-level (i.e. root) node.
- ///
- public int level;
-
- /// The resolution level to which this subband contributes. 0 is the
- /// smallest resolution level (the one with the lowest frequency LL
- /// subband).
- ///
- public int resLvl;
-
- /// The number of code-blocks (in both directions) contained in this
- /// subband.
- ///
- public Coord numCb = null;
-
- /// The base 2 exponent of the analysis gain of the subband. The analysis
- /// gain of a subband is defined as the gain of the previous subband
- /// (i.e. the one from which this one was obtained) multiplied by the line
- /// gain and by the column gain. The line (column) gain is the gain of the
- /// line (column) filter that was used to obtain it, which is the DC gain
- /// for a low-pass filter and the Nyquist gain for a high-pass filter. It
- /// is 0 by default.
- ///
- /// Using the base 2 exponent of the value contrains the possible gains
- /// to powers of 2. However this is perfectly compatible to the filter
- /// normalization policy assumed here. See the split() method for more
- /// details.
- ///
- ///
- ///
- ///
- ///
- public int anGainExp;
-
- /// The subband index within its resolution level. This value uniquely
- /// identifies a subband within a resolution level and a decomposition
- /// level within it. Note that only leaf elements represent "real"
- /// subbands, while node elements represent only intermediate stages.
- ///
- /// It is defined recursively. The root node gets a value of 0. For a
- /// given node, with a subband index 'b', its LL descendant gets 4*b, its
- /// HL descendant 4*b+1, its LH descendant 4*b+2, and its HH descendant
- /// 4*b+3, for their subband indexes.
- ///
- ///
- public int sbandIdx = 0;
-
- /// The horizontal coordinate of the upper-left corner of the subband, with
- /// respect to the canvas origin, in the component's grid and subband's
- /// decomposition level. This is the real horizontal index of the first
- /// column of this subband. If even the horizontal decomposition of this
- /// subband should be done with the low-pass-first convention. If odd it
- /// should be done with the high-pass-first convention.
- ///
- ///
- public int ulcx;
-
- /// The vertical coordinate of the upper-left corner of the subband, with
- /// respect to the canvas origin, in the component's grid and subband's
- /// decomposition level. This is the real vertical index of the first
- /// column of this subband. If even the vertical decomposition of this
- /// subband should be done with the low-pass-first convention. If odd it
- /// should be done with the high-pass-first convention.
- ///
- ///
- public int ulcy;
-
- /// The horizontal coordinate of the upper-left corner of the subband
- public int ulx;
-
- /// The vertical coordinate of the upper-left corner of the subband
- public int uly;
-
- /// The width of the subband
- public int w;
-
- /// The height of the subband
- public int h;
-
- /// The nominal code-block width
- public int nomCBlkW;
-
- /// The nominal code-block height
- public int nomCBlkH;
-
- /// Splits the current subband in its four subbands. This creates the four
- /// childs (LL, HL, LH and HH) and converts the leaf in a node.
- ///
- ///
- /// The horizontal wavelet filter used to decompose this
- /// subband.
- ///
- ///
- /// The vertical wavelet filter used to decompose this
- /// subband.
- ///
- ///
- /// A reference to the LL leaf (getLL()).
- ///
- ///
- protected internal abstract Subband split(WaveletFilter hfilter, WaveletFilter vfilter);
-
- /// Initializes the childs of this node with the correct values. The sizes
- /// of the child subbands are calculated by taking into account the
- /// position of the subband in the canvas.
- ///
- /// For the analysis subband gain calculation it is assumed that
- /// analysis filters are normalized with a DC gain of 1 and a Nyquist gain
- /// of 2.
- ///
- ///
- protected internal virtual void initChilds()
- {
- Subband subb_LL = LL;
- Subband subb_HL = HL;
- Subband subb_LH = LH;
- Subband subb_HH = HH;
-
- // LL subband
- subb_LL.level = level + 1;
- subb_LL.ulcx = (ulcx + 1) >> 1;
- subb_LL.ulcy = (ulcy + 1) >> 1;
- subb_LL.ulx = ulx;
- subb_LL.uly = uly;
- subb_LL.w = ((ulcx + w + 1) >> 1) - subb_LL.ulcx;
- subb_LL.h = ((ulcy + h + 1) >> 1) - subb_LL.ulcy;
- // If this subband in in the all LL path (i.e. it's global orientation
- // is LL) then child LL band contributes to a lower resolution level.
- subb_LL.resLvl = (orientation == WT_ORIENT_LL) ? resLvl - 1 : resLvl;
- subb_LL.anGainExp = anGainExp;
- subb_LL.sbandIdx = (sbandIdx << 2);
- // HL subband
- subb_HL.orientation = WT_ORIENT_HL;
- subb_HL.level = subb_LL.level;
- subb_HL.ulcx = ulcx >> 1;
- subb_HL.ulcy = subb_LL.ulcy;
- subb_HL.ulx = ulx + subb_LL.w;
- subb_HL.uly = uly;
- subb_HL.w = ((ulcx + w) >> 1) - subb_HL.ulcx;
- subb_HL.h = subb_LL.h;
- subb_HL.resLvl = resLvl;
- subb_HL.anGainExp = anGainExp + 1;
- subb_HL.sbandIdx = (sbandIdx << 2) + 1;
- // LH subband
- subb_LH.orientation = WT_ORIENT_LH;
- subb_LH.level = subb_LL.level;
- subb_LH.ulcx = subb_LL.ulcx;
- subb_LH.ulcy = ulcy >> 1;
- subb_LH.ulx = ulx;
- subb_LH.uly = uly + subb_LL.h;
- subb_LH.w = subb_LL.w;
- subb_LH.h = ((ulcy + h) >> 1) - subb_LH.ulcy;
- subb_LH.resLvl = resLvl;
- subb_LH.anGainExp = anGainExp + 1;
- subb_LH.sbandIdx = (sbandIdx << 2) + 2;
- // HH subband
- subb_HH.orientation = WT_ORIENT_HH;
- subb_HH.level = subb_LL.level;
- subb_HH.ulcx = subb_HL.ulcx;
- subb_HH.ulcy = subb_LH.ulcy;
- subb_HH.ulx = subb_HL.ulx;
- subb_HH.uly = subb_LH.uly;
- subb_HH.w = subb_HL.w;
- subb_HH.h = subb_LH.h;
- subb_HH.resLvl = resLvl;
- subb_HH.anGainExp = anGainExp + 2;
- subb_HH.sbandIdx = (sbandIdx << 2) + 3;
- }
-
- /// Creates a Subband element with all the default values. The dimensions
- /// are (0,0), the upper left corner is (0,0) and the upper-left corner
- /// with respect to the canvas is (0,0) too.
- ///
- ///
- public Subband()
- {
- }
-
- /// Creates the top-level node and the entire subband tree, with the
- /// top-level dimensions, the number of decompositions, and the
- /// decomposition tree as specified.
- ///
- /// For the analysis subband gain calculation it is assumed that
- /// analysis filters are normalized with a DC gain of 1 and a Nyquist gain
- /// of 2.
- ///
- /// This constructor does not initialize the value of the magBits member
- /// variable. This variable is normally initialized by the quantizer, on
- /// the encoder side, or the bit stream reader, on the decoder side.
- ///
- ///
- /// The top-level width
- ///
- ///
- /// The top-level height
- ///
- ///
- /// The horizontal coordinate of the upper-left corner with
- /// respect to the canvas origin, in the component grid.
- ///
- ///
- /// The vertical coordinate of the upper-left corner with
- /// respect to the canvas origin, in the component grid.
- ///
- ///
- /// The number of levels (or LL decompositions) in the tree.
- ///
- ///
- /// The horizontal wavelet filters (analysis or synthesis)
- /// for each resolution level, starting at resolution level 0. If there are
- /// less elements in the array than there are resolution levels, the last
- /// element is used for the remaining resolution levels.
- ///
- ///
- /// The vertical wavelet filters (analysis or synthesis)
- /// for each resolution level, starting at resolution level 0. If there are
- /// less elements in the array than there are resolution levels, the last
- /// element is used for the remaining resolution levels.
- ///
- ///
- ///
- ///
- ///
- public Subband(int w, int h, int ulcx, int ulcy, int lvls, WaveletFilter[] hfilters, WaveletFilter[] vfilters)
- {
- int i, hi, vi;
- Subband cur; // The current subband
-
- // Initialize top-level node
- this.w = w;
- this.h = h;
- this.ulcx = ulcx;
- this.ulcy = ulcy;
- this.resLvl = lvls;
- // First create dyadic decomposition.
- cur = this;
- for (i = 0; i < lvls; i++)
- {
- hi = (cur.resLvl <= hfilters.Length) ? cur.resLvl - 1 : hfilters.Length - 1;
- vi = (cur.resLvl <= vfilters.Length) ? cur.resLvl - 1 : vfilters.Length - 1;
- cur = cur.split(hfilters[hi], vfilters[vi]);
- }
- }
-
- /// Returns the next subband in the same resolution level, following the
- /// subband index order. If already at the last subband then null is
- /// returned. If this subband is not a leaf an IllegalArgumentException is
- /// thrown.
- ///
- ///
- /// The next subband in the same resolution level, following the
- /// subband index order, or null if already at last subband.
- ///
- ///
- public virtual Subband nextSubband()
- {
- Subband sb;
-
- if (isNode)
- {
- throw new System.ArgumentException();
- }
-
- switch (orientation)
- {
-
- case WT_ORIENT_LL:
- sb = Parent;
- if (sb == null || sb.resLvl != resLvl)
- {
- // Already at top-level or last subband in res. level
- return null;
- }
- else
- {
- return sb.HL;
- }
- //goto case WT_ORIENT_HL;
-
- case WT_ORIENT_HL:
- return Parent.LH;
-
- case WT_ORIENT_LH:
- return Parent.HH;
-
- case WT_ORIENT_HH:
- // This is the complicated one
- sb = this;
- while (sb.orientation == WT_ORIENT_HH)
- {
- sb = sb.Parent;
- }
- switch (sb.orientation)
- {
-
- case WT_ORIENT_LL:
- sb = sb.Parent;
- if (sb == null || sb.resLvl != resLvl)
- {
- // Already at top-level or last subband in res. level
- return null;
- }
- else
- {
- sb = sb.HL;
- }
- break;
-
- case WT_ORIENT_HL:
- sb = sb.Parent.LH;
- break;
-
- case WT_ORIENT_LH:
- sb = sb.Parent.HH;
- break;
-
- default:
- throw new System.ApplicationException("You have found a bug in JJ2000");
-
- }
- while (sb.isNode)
- {
- sb = sb.LL;
- }
- return sb;
-
- default:
- throw new System.ApplicationException("You have found a bug in JJ2000");
-
- }
- }
-
- /// Returns a subband element in the tree, given its resolution level and
- /// subband index. This method searches through the tree.
- ///
- ///
- /// The resolution level.
- ///
- ///
- /// The subband index, within the resolution level.
- ///
- ///
- public virtual Subband getSubbandByIdx(int rl, int sbi)
- {
- Subband sb = this;
-
- // Find the root subband for the resolution level
- if (rl > sb.resLvl || rl < 0)
- {
- throw new System.ArgumentException("Resolution level index " + "out of range");
- }
-
- // Returns directly if it is itself
- if (rl == sb.resLvl && sbi == sb.sbandIdx)
- return sb;
-
- if (sb.sbandIdx != 0)
- sb = sb.Parent;
-
- while (sb.resLvl > rl)
- sb = sb.LL;
- while (sb.resLvl < rl)
- sb = sb.Parent;
-
- switch (sbi)
- {
-
- case 0:
- default:
- return sb;
-
- case 1:
- return sb.HL;
-
- case 2:
- return sb.LH;
-
- case 3:
- return sb.HH;
- }
- }
-
- /// Returns a reference to the Subband element to which the specified point
- /// belongs. The specified point must be inside this (i.e. the one defined
- /// by this object) subband. This method searches through the tree.
- ///
- ///
- /// horizontal coordinate of the specified point.
- ///
- ///
- /// horizontal coordinate of the specified point.
- ///
- ///
- public virtual Subband getSubband(int x, int y)
- {
- Subband cur, hhs;
-
- // Check that we are inside this subband
- if (x < ulx || y < uly || x >= ulx + w || y >= uly + h)
- {
- throw new System.ArgumentException();
- }
-
- cur = this;
- while (cur.isNode)
- {
- hhs = cur.HH;
- // While we are still at a node -> continue
- if (x < hhs.ulx)
- {
- // Is the result of horizontal low-pass
- if (y < hhs.uly)
- {
- // Vertical low-pass
- cur = cur.LL;
- }
- else
- {
- // Vertical high-pass
- cur = cur.LH;
- }
- }
- else
- {
- // Is the result of horizontal high-pass
- if (y < hhs.uly)
- {
- // Vertical low-pass
- cur = cur.HL;
- }
- else
- {
- // Vertical high-pass
- cur = cur.HH;
- }
- }
- }
-
- return cur;
- }
-
- /// Returns subband informations in a string.
- ///
- ///
- /// Subband informations
- ///
- ///
- public override System.String ToString()
- {
- System.String string_Renamed = "w=" + w + ",h=" + h + ",ulx=" + ulx + ",uly=" + uly + ",ulcx=" + ulcx + ",ulcy=" + ulcy + ",idx=" + sbandIdx + ",orient=" + orientation + ",node=" + isNode + ",level=" + level + ",resLvl=" + resLvl + ",nomCBlkW=" + nomCBlkW + ",nomCBlkH=" + nomCBlkH + ",numCb=" + numCb;
-
- return string_Renamed;
- }
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/wavelet/WTDecompSpec.cs b/CSJ2K/j2k/wavelet/WTDecompSpec.cs
deleted file mode 100644
index dd7aaff4..00000000
--- a/CSJ2K/j2k/wavelet/WTDecompSpec.cs
+++ /dev/null
@@ -1,320 +0,0 @@
-/*
-* CVS identifier:
-*
-* $Id: WTDecompSpec.java,v 1.9 2000/09/05 09:26:06 grosbois Exp $
-*
-* Class: WTDecompSpec
-*
-* Description:
-*
-*
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-*
-*
-*
-*/
-using System;
-namespace CSJ2K.j2k.wavelet
-{
-
- /// This class holds the decomposition type to be used in each part of the
- /// image; the default one, the component specific ones, the tile default ones
- /// and the component-tile specific ones.
- ///
- /// The decomposition type identifiers values are the same as in the
- /// codestream.
- ///
- ///
The hierarchy is:
- /// - Tile and component specific decomposition
- /// - Tile specific default decomposition
- /// - Component main default decomposition
- /// - Main default decomposition
- ///
- ///
At the moment tiles are not supported by this class.
- ///
- ///
- public class WTDecompSpec
- {
- /// Returns the main default decomposition type.
- ///
- ///
- /// The main default decomposition type.
- ///
- ///
- ///
- ///
- virtual public int MainDefDecompType
- {
- get
- {
- return mainDefDecompType;
- }
-
- }
- /// Returns the main default decomposition number of levels.
- ///
- ///
- /// The main default decomposition number of levels.
- ///
- ///
- ///
- ///
- virtual public int MainDefLevels
- {
- get
- {
- return mainDefLevels;
- }
-
- }
- /// ID for the dyadic wavelet tree decomposition (also called
- /// "Mallat" in JPEG 2000): 0x00.
- ///
- public const int WT_DECOMP_DYADIC = 0;
-
- /// ID for the SPACL (as defined in JPEG 2000) wavelet tree
- /// decomposition (1 level of decomposition in the high bands and
- /// some specified number for the lowest LL band): 0x02.
- ///
- public const int WT_DECOMP_SPACL = 2;
-
- /// ID for the PACKET (as defined in JPEG 2000) wavelet tree
- /// decomposition (2 levels of decomposition in the high bands and
- /// some specified number for the lowest LL band): 0x01.
- ///
- public const int WT_DECOMP_PACKET = 1;
-
- /// The identifier for "main default" specified decomposition
- public const byte DEC_SPEC_MAIN_DEF = 0;
-
- /// The identifier for "component default" specified decomposition
- public const byte DEC_SPEC_COMP_DEF = 1;
-
- /// The identifier for "tile specific default" specified decomposition
- public const byte DEC_SPEC_TILE_DEF = 2;
-
- /// The identifier for "tile and component specific" specified
- /// decomposition
- ///
- public const byte DEC_SPEC_TILE_COMP = 3;
-
- /// The spec type for each tile and component. The first index is the
- /// component index, the second is the tile index. NOTE: The tile specific
- /// things are not supported yet.
- ///
- // Use byte to save memory (no need for speed here).
- private byte[] specValType;
-
- /// The main default decomposition
- private int mainDefDecompType;
-
- /// The main default number of decomposition levels
- private int mainDefLevels;
-
- /// The component main default decomposition, for each component.
- private int[] compMainDefDecompType;
-
- /// The component main default decomposition levels, for each component
- private int[] compMainDefLevels;
-
- /// Constructs a new 'WTDecompSpec' for the specified number of components
- /// and tiles, with the given main default decomposition type and number of
- /// levels.
- ///
- /// NOTE: The tile specific things are not supported yet
- ///
- ///
- /// The number of components
- ///
- ///
- /// The number of tiles
- ///
- ///
- /// The main default decomposition type
- ///
- ///
- /// The main default number of decomposition levels
- ///
- ///
- ///
- ///
- public WTDecompSpec(int nc, int dec, int lev)
- {
- mainDefDecompType = dec;
- mainDefLevels = lev;
- specValType = new byte[nc];
- }
-
- /// Sets the "component main default" decomposition type and number of
- /// levels for the specified component. Both 'dec' and 'lev' can not be
- /// negative at the same time.
- ///
- ///
- /// The component index
- ///
- ///
- /// The decomposition type. If negative then the main default is
- /// used.
- ///
- ///
- /// The number of levels. If negative then the main defaul is
- /// used.
- ///
- ///
- ///
- ///
- public virtual void setMainCompDefDecompType(int n, int dec, int lev)
- {
- if (dec < 0 && lev < 0)
- {
- throw new System.ArgumentException();
- }
- // Set spec type and decomp
- specValType[n] = DEC_SPEC_COMP_DEF;
- if (compMainDefDecompType == null)
- {
- compMainDefDecompType = new int[specValType.Length];
- compMainDefLevels = new int[specValType.Length];
- }
- compMainDefDecompType[n] = (dec >= 0) ? dec : mainDefDecompType;
- compMainDefLevels[n] = (lev >= 0) ? lev : mainDefLevels;
- // For the moment disable it since other parts of JJ2000 do not
- // support this
- throw new NotImplementedException("Currently, in JJ2000, all components " + "and tiles must have the same " + "decomposition type and number of " + "levels");
- }
-
- /// Returns the type of specification for the decomposition in the
- /// specified component and tile. The specification type is one of:
- /// 'DEC_SPEC_MAIN_DEF', 'DEC_SPEC_COMP_DEF', 'DEC_SPEC_TILE_DEF',
- /// 'DEC_SPEC_TILE_COMP'.
- ///
- /// NOTE: The tile specific things are not supported yet
- ///
- ///
- /// The component index
- ///
- ///
- /// The tile index, in raster scan order.
- ///
- ///
- /// The specification type for component 'n' and tile 't'.
- ///
- ///
- ///
- ///
- public virtual byte getDecSpecType(int n)
- {
- return specValType[n];
- }
-
- /// Returns the decomposition type to be used in component 'n' and tile
- /// 't'.
- ///
- /// NOTE: The tile specific things are not supported yet
- ///
- ///
- /// The component index.
- ///
- ///
- /// The tile index, in raster scan order
- ///
- ///
- /// The decomposition type to be used.
- ///
- ///
- ///
- ///
- public virtual int getDecompType(int n)
- {
- switch (specValType[n])
- {
-
- case DEC_SPEC_MAIN_DEF:
- return mainDefDecompType;
-
- case DEC_SPEC_COMP_DEF:
- return compMainDefDecompType[n];
-
- case DEC_SPEC_TILE_DEF:
- throw new NotImplementedException();
-
- case DEC_SPEC_TILE_COMP:
- throw new NotImplementedException();
-
- default:
- throw new System.ApplicationException("Internal JJ2000 error");
-
- }
- }
-
- /// Returns the decomposition number of levels in component 'n' and tile
- /// 't'.
- ///
- /// NOTE: The tile specific things are not supported yet
- ///
- ///
- /// The component index.
- ///
- ///
- /// The tile index, in raster scan order
- ///
- ///
- /// The decomposition number of levels.
- ///
- ///
- ///
- ///
- public virtual int getLevels(int n)
- {
- switch (specValType[n])
- {
-
- case DEC_SPEC_MAIN_DEF:
- return mainDefLevels;
-
- case DEC_SPEC_COMP_DEF:
- return compMainDefLevels[n];
-
- case DEC_SPEC_TILE_DEF:
- throw new NotImplementedException();
-
- case DEC_SPEC_TILE_COMP:
- throw new NotImplementedException();
-
- default:
- throw new System.ApplicationException("Internal JJ2000 error");
-
- }
- }
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/wavelet/WTFilterSpec.cs b/CSJ2K/j2k/wavelet/WTFilterSpec.cs
deleted file mode 100644
index 339a20ba..00000000
--- a/CSJ2K/j2k/wavelet/WTFilterSpec.cs
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
-* CVS identifier:
-*
-* $Id: WTFilterSpec.java,v 1.10 2000/09/05 09:26:08 grosbois Exp $
-*
-* Class: WTFilterSpec
-*
-* Description: Generic class for storing wavelet filter specs
-*
-*
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-*
-*
-*
-*/
-namespace CSJ2K.j2k.wavelet
-{
-
- /// This is the generic class from which the ones that hold the analysis or
- /// synthesis filters to be used in each part of the image derive. See
- /// AnWTFilterSpec and SynWTFilterSpec.
- ///
- /// The filters to use are defined by a hierarchy. The hierarchy is:
- ///
- ///
- Tile and component specific filters
- /// - Tile specific default filters
- /// - Component main default filters
- /// - Main default filters
- ///
- ///
At the moment tiles are not supported by this class.
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
-
- public abstract class WTFilterSpec
- {
- /// Returns the data type used by the filters in this object, as defined in
- /// the 'DataBlk' interface.
- ///
- ///
- /// The data type of the filters in this object
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public abstract int WTDataType { get; }
-
- /// The identifier for "main default" specified filters
- public const byte FILTER_SPEC_MAIN_DEF = 0;
-
- /// The identifier for "component default" specified filters
- public const byte FILTER_SPEC_COMP_DEF = 1;
-
- /// The identifier for "tile specific default" specified filters
- public const byte FILTER_SPEC_TILE_DEF = 2;
-
- /// The identifier for "tile and component specific" specified filters
- public const byte FILTER_SPEC_TILE_COMP = 3;
-
- /// The spec type for each tile and component. The first index is the
- /// component index, the second is the tile index. NOTE: The tile specific
- /// things are not supported yet.
- ///
- // Use byte to save memory (no need for speed here).
- protected internal byte[] specValType;
-
- /// Constructs a 'WTFilterSpec' object, initializing all the components and
- /// tiles to the 'FILTER_SPEC_MAIN_DEF' spec type, for the specified number
- /// of components and tiles.
- ///
- /// NOTE: The tile specific things are not supported yet
- ///
- ///
- /// The number of components
- ///
- ///
- /// The number of tiles
- ///
- ///
- ///
- ///
- protected internal WTFilterSpec(int nc)
- {
- specValType = new byte[nc];
- }
-
- /// Returns the type of specification for the filters in the specified
- /// component and tile. The specification type is one of:
- /// 'FILTER_SPEC_MAIN_DEF', 'FILTER_SPEC_COMP_DEF', 'FILTER_SPEC_TILE_DEF',
- /// 'FILTER_SPEC_TILE_COMP'.
- ///
- /// NOTE: The tile specific things are not supported yet
- ///
- ///
- /// The component index
- ///
- ///
- /// The tile index, in raster scan order.
- ///
- ///
- /// The specification type for component 'n' and tile 't'.
- ///
- ///
- ///
- ///
- public virtual byte getKerSpecType(int n)
- {
- return specValType[n];
- }
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/wavelet/WaveletFilter.cs b/CSJ2K/j2k/wavelet/WaveletFilter.cs
deleted file mode 100644
index e347339f..00000000
--- a/CSJ2K/j2k/wavelet/WaveletFilter.cs
+++ /dev/null
@@ -1,244 +0,0 @@
-/*
-* CVS identifier:
-*
-* $Id: WaveletFilter.java,v 1.13 2001/08/02 11:11:16 grosbois Exp $
-*
-* Class: WaveletFilter
-*
-* Description: Defines the interface for WT filters (analysis
-* and synthesis)
-*
-*
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-*/
-namespace CSJ2K.j2k.wavelet
-{
-
- /// This interface defines how a wavelet filter implementation should present
- /// itself. This interface defines only the commonalities between the analysis
- /// and synthesis filters. The AnWTFilter and SynWTFilter classes provide the
- /// specifics of analysis and synthesis filters.
- ///
- /// Both analysis and filters must be able to return the extent of the
- /// negative and positive support for both synthesis and analysis sides. This
- /// simplifies the sue of some functionalities that need extra information
- /// about the filters.
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public struct WaveletFilter_Fields
- {
- /// The ID for integer lifting spteps implementations
- public readonly static int WT_FILTER_INT_LIFT = 0;
- /// The ID for floating-point lifting spteps implementations
- public readonly static int WT_FILTER_FLOAT_LIFT = 1;
- /// The ID for floatring-poitn convolution implementations
- public readonly static int WT_FILTER_FLOAT_CONVOL = 2;
- }
- public interface WaveletFilter
- {
- //UPGRADE_NOTE: Members of interface 'WaveletFilter' were extracted into structure 'WaveletFilter_Fields'. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1045'"
- /// Returns the negative support of the low-pass analysis filter. That is
- /// the number of taps of the filter in the negative direction.
- ///
- ///
- /// The number of taps of the low-pass analysis filter in the
- /// negative direction
- ///
- int AnLowNegSupport
- {
- get;
-
- }
- /// Returns the positive support of the low-pass analysis filter. That is
- /// the number of taps of the filter in the negative direction.
- ///
- ///
- /// The number of taps of the low-pass analysis filter in the
- /// positive direction
- ///
- int AnLowPosSupport
- {
- get;
-
- }
- /// Returns the negative support of the high-pass analysis filter. That is
- /// the number of taps of the filter in the negative direction.
- ///
- ///
- /// The number of taps of the high-pass analysis filter in the
- /// negative direction
- ///
- int AnHighNegSupport
- {
- get;
-
- }
- /// Returns the positive support of the high-pass analysis filter. That is
- /// the number of taps of the filter in the negative direction.
- ///
- ///
- /// The number of taps of the high-pass analysis filter in
- /// the positive direction
- ///
- int AnHighPosSupport
- {
- get;
-
- }
- /// Returns the negative support of the low-pass synthesis filter. That is
- /// the number of taps of the filter in the negative direction.
- ///
- ///
- /// The number of taps of the low-pass synthesis filter in the
- /// negative direction
- ///
- int SynLowNegSupport
- {
- get;
-
- }
- /// Returns the positive support of the low-pass synthesis filter. That is
- /// the number of taps of the filter in the negative direction.
- ///
- ///
- /// The number of taps of the low-pass synthesis filter in the
- /// positive direction
- ///
- int SynLowPosSupport
- {
- get;
-
- }
- /// Returns the negative support of the high-pass synthesis filter. That is
- /// the number of taps of the filter in the negative direction.
- ///
- ///
- /// The number of taps of the high-pass synthesis filter in the
- /// negative direction
- ///
- int SynHighNegSupport
- {
- get;
-
- }
- /// Returns the positive support of the high-pass synthesis filter. That is
- /// the number of taps of the filter in the negative direction.
- ///
- ///
- /// The number of taps of the high-pass synthesis filter in the
- /// positive direction
- ///
- int SynHighPosSupport
- {
- get;
-
- }
- /// Returns the implementation type of this filter, as defined in this
- /// class, such as WT_FILTER_INT_LIFT, WT_FILTER_FLOAT_LIFT,
- /// WT_FILTER_FLOAT_CONVOL.
- ///
- ///
- /// The implementation type of this filter: WT_FILTER_INT_LIFT,
- /// WT_FILTER_FLOAT_LIFT, WT_FILTER_FLOAT_CONVOL.
- ///
- int ImplType
- {
- get;
-
- }
- /// Returns the type of data on which this filter works, as defined in the
- /// DataBlk interface.
- ///
- ///
- /// The type of data as defined in the DataBlk interface.
- ///
- ///
- ///
- ///
- int DataType
- {
- get;
-
- }
- /// Returns the reversibility of the filter. A filter is considered
- /// reversible if it is suitable for lossless coding.
- ///
- ///
- /// true if the filter is reversible, false otherwise.
- ///
- ///
- bool Reversible
- {
- get;
-
- }
-
- /// Returns true if the wavelet filter computes or uses the same "inner"
- /// subband coefficient as the full frame wavelet transform, and false
- /// otherwise. In particular, for block based transforms with reduced
- /// overlap, this method should return false. The term "inner" indicates
- /// that this applies only with respect to the coefficient that are not
- /// affected by image boundaries processings such as symmetric extension,
- /// since there is not reference method for this.
- ///
- /// The result depends on the length of the allowed overlap when
- /// compared to the overlap required by the wavelet filter. It also depends
- /// on how overlap processing is implemented in the wavelet filter.
- ///
- ///
- /// This is the number of samples in the input signal
- /// before the first sample to filter that can be used for overlap.
- ///
- ///
- /// This is the number of samples in the input signal
- /// after the last sample to filter that can be used for overlap.
- ///
- ///
- /// This is the lenght of the input signal to filter.The
- /// required number of samples in the input signal after the last sample
- /// depends on the length of the input signal.
- ///
- ///
- /// true if the overlaps are large enough and correct processing is
- /// performed, false otherwise.
- ///
- ///
- bool isSameAsFullWT(int tailOvrlp, int headOvrlp, int inLen);
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/wavelet/WaveletTransform.cs b/CSJ2K/j2k/wavelet/WaveletTransform.cs
deleted file mode 100644
index c72f0e8b..00000000
--- a/CSJ2K/j2k/wavelet/WaveletTransform.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
-* CVS identifier:
-*
-* $Id: WaveletTransform.java,v 1.18 2001/10/24 12:02:35 grosbois Exp $
-*
-* Class: WaveletTransform
-*
-* Description: Interface that defines how a forward or
-* inverse wavelet transform should present
-* itself.
-*
-*
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-* */
-using CSJ2K.j2k.image;
-namespace CSJ2K.j2k.wavelet
-{
-
- /// This interface defines how a forward or inverse wavelet transform should
- /// present itself. As specified in the ImgData interface, from which this
- /// class inherits, all operations are confined to the current tile, and all
- /// coordinates are relative to it.
- ///
- /// The definition of the methods in this interface allows for different
- /// types of implementation, reversibility and levels of decompositions for
- /// each component and each tile. An implementation of this interface does not
- /// need to support all this flexibility (e.g., it may provide the same
- /// implementation type and decomposition levels for all tiles and
- /// components).
- ///
- ///
- public struct WaveletTransform_Fields
- {
- /// ID for line based implementations of wavelet transforms.
- ///
- ///
- public readonly static int WT_IMPL_LINE = 0;
- /// ID for full-page based implementations of wavelet transforms. Full-page
- /// based implementations should be avoided since they require large
- /// amounts of memory.
- ///
- ///
- public readonly static int WT_IMPL_FULL = 2;
- }
- public interface WaveletTransform : ImgData
- {
- //UPGRADE_NOTE: Members of interface 'WaveletTransform' were extracted into structure 'WaveletTransform_Fields'. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1045'"
-
-
- /// Returns the reversibility of the wavelet transform for the specified
- /// component and tile. A wavelet transform is reversible when it is
- /// suitable for lossless and lossy-to-lossless compression.
- ///
- ///
- /// The index of the tile.
- ///
- ///
- /// The index of the component.
- ///
- ///
- /// true is the wavelet transform is reversible, false if not.
- ///
- ///
- bool isReversible(int t, int c);
-
- /// Returns the implementation type of this wavelet transform (WT_IMPL_LINE
- /// or WT_IMPL_FRAME) for the specified component, in the current tile.
- ///
- ///
- /// The index of the component.
- ///
- ///
- /// WT_IMPL_LINE or WT_IMPL_FULL for line, block or full-page based
- /// transforms.
- ///
- ///
- int getImplementationType(int c);
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/wavelet/analysis/AnWTFilter.cs b/CSJ2K/j2k/wavelet/analysis/AnWTFilter.cs
deleted file mode 100644
index fb2775f9..00000000
--- a/CSJ2K/j2k/wavelet/analysis/AnWTFilter.cs
+++ /dev/null
@@ -1,488 +0,0 @@
-/*
-* CVS identifier:
-*
-* $Id: AnWTFilter.java,v 1.15 2001/05/08 16:14:52 grosbois Exp $
-*
-* Class: AnWTFilter
-*
-* Description: The abstract class for all analysis wavelet filters
-*
-*
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-* */
-namespace CSJ2K.j2k.wavelet.analysis
-{
-
- /// This abstract class defines the methods of all analysis wavelet
- /// filters. Specialized abstract classes that work on particular data types
- /// (int, float) provide more specific method calls while retaining the
- /// generality of this one. See the AnWTFilterInt and AnWTFilterFloat
- /// classes. Implementations of analysis filters should inherit from one of
- /// those classes.
- ///
- /// All analysis wavelet filters should follow the following conventions:
- ///
- ///
- /// - The first sample to filter is the low-pass one. As a consequence, if
- /// the input signal is of odd-length then the low-pass output signal is one
- /// sample longer than the high-pass output one. Therefore, if the length of
- /// input signal is N, the low-pass output signal is of length N/2 if N is even
- /// and N/2+1/2 if N is odd, while the high-pass output signal is of length N/2
- /// if N is even and N/2-1/2 if N is odd.
- ///
- /// - The normalization is 1 for the DC gain and 2 for the Nyquist gain (Type
- /// I normalization), for both reversible and non-reversible filters.
- ///
- /// - If the length of input signal is N, the low-pass output signal is of
- /// length N/2 if N is even and N/2+1/2 if N is odd, while the high-pass output
- /// sample is of length N/2 if N is even and N/2-1/2 if N is odd.
- ///
- /// - The analyze method may seem very complicated, but is designed to
- /// minimize the amount of data copying and redundant calculations when used
- /// for block-based or line-based wavelet transform implementations, while
- /// being applicable to full-frame transforms as well.
- ///
- /// - All filters should implement the equals() method of the Object
- /// class. The call x.equals(y) should test if the 'x' and 'y' filters are the
- /// same or not, in what concerns the bit stream header syntax (two filters are
- /// the same if the same filter code should be output to the bit stream).
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public abstract class AnWTFilter : WaveletFilter
- {
- /// Returns the type of filter used according to the FilterTypes interface.
- ///
- ///
- ///
- ///
- ///
- /// The filter type.
- ///
- ///
- public abstract int FilterType { get; }
- /// Returns the parameters that are used in this class and implementing
- /// classes. It returns a 2D String array. Each of the 1D arrays is for a
- /// different option, and they have 3 elements. The first element is the
- /// option name, the second one is the synopsis, the third one is a long
- /// description of what the parameter is and the fourth is its default
- /// value. The synopsis or description may be 'null', in which case it is
- /// assumed that there is no synopsis or description of the option,
- /// respectively. Null may be returned if no options are supported.
- ///
- ///
- /// the options name, their synopsis and their explanation, or null
- /// if no options are supported.
- ///
- ///
- public static System.String[][] ParameterInfo
- {
- get
- {
- return pinfo;
- }
-
- }
- public abstract int AnHighPosSupport { get; }
- public abstract int AnLowNegSupport { get; }
- public abstract int AnLowPosSupport { get; }
- public abstract bool Reversible { get; }
- public abstract int ImplType { get; }
- public abstract int SynHighNegSupport { get; }
- public abstract int SynHighPosSupport { get; }
- public abstract int AnHighNegSupport { get; }
- public abstract int DataType { get; }
- public abstract int SynLowNegSupport { get; }
- public abstract int SynLowPosSupport { get; }
-
- /// The prefix for wavelet filter options: 'F'
- public const char OPT_PREFIX = 'F';
-
- /// The list of parameters that is accepted for wavelet filters. Options
- /// for wavelet filters start with a 'F'.
- ///
- //UPGRADE_NOTE: Final was removed from the declaration of 'pinfo'. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private static readonly System.String[][] pinfo = new System.String[][] { new System.String[] { "Ffilters", "[] " + "[ [] ...]", "Specifies which filters to use for specified tile-component. " + "If this option is not used, the encoder choses the filters " + " of the tile-components according to their quantization type." + " If this option is used, a component transformation is applied " + "to the three first components.\n" + ": see general note\n" + ": ',' separates horizontal and vertical filters, ':' separates" + " decomposition levels filters. JPEG 2000 part 1 only supports w5x3" + " and w9x7 filters.", null } };
-
- /// Filters the input signal by this analysis filter, decomposing it in a
- /// low-pass and a high-pass signal. This method performs the filtering and
- /// the subsampling with the low pass first filtering convention.
- ///
- /// The input signal resides in the inSig array. The index of the first
- /// sample to filter (i.e. that will generate the first low-pass output
- /// sample) is given by inOff. The number of samples to filter is given by
- /// inLen. This array must be of the same type as the one for which the
- /// particular implementation works with (which is returned by the
- /// getDataType() method).
- ///
- /// The input signal can be interleaved with other signals in the same
- /// inSig array, and this is determined by the inStep argument. This means
- /// that the first sample of the input signal is inSig[inOff], the second
- /// is inSig[inOff+inStep], the third is inSig[inOff+2*inStep], and so
- /// on. Therefore if inStep is 1 there is no interleaving. This feature
- /// allows to filter columns of a 2-D signal, when it is stored in a line
- /// by line order in inSig, without having to copy the data, in this case
- /// the inStep argument should be the line width.
- ///
- /// This method also allows to apply the analysis wavelet filter by
- /// parts in the input signal using an overlap and thus producing the same
- /// coefficients at the output. The tailOvrlp argument specifies how many
- /// samples in the input signal, before the first one to be filtered, can
- /// be used for overlap. Then, the filter instead of extending the input
- /// signal will use those samples to calculate the first output
- /// samples. The argument tailOvrlp can be 0 for no overlap, or some value
- /// that provides partial or full overlap. There should be enough samples
- /// in the input signal, before the first sample to be filtered, to support
- /// the overlap. The headOvrlp provides the same functionality but at the
- /// end of the input signal. The inStep argument also applies to samples
- /// used for overlap. This overlap feature can be used for line-based
- /// wavelet transforms (in which case it will only be used when filtering
- /// the columns) or for overlapping block-based wavelet transforms (in
- /// which case it will be used when filtering lines and columns).
- ///
- /// The low-pass output signal is placed in the lowSig array. The lowOff
- /// and lowStep arguments are analogous to the inOff and inStep ones, but
- /// they apply to the lowSig array. The lowSig array must be long enough to
- /// hold the low-pass output signal.
- ///
- /// The high-pass output signal is placed in the highSig array. The
- /// highOff and highStep arguments are analogous to the inOff and inStep
- /// ones, but they apply to the highSig array. The highSig array must be
- /// long enough to hold the high-pass output signal.
- ///
- ///
- /// This is the array that contains the input signal. It must
- /// be of the correct type (e.g., it must be int[] if getDataType() returns
- /// TYPE_INT).
- ///
- ///
- /// This is the index in inSig of the first sample to filter.
- ///
- ///
- /// This is the number of samples in the input signal to
- /// filter.
- ///
- ///
- /// This is the step, or interleave factor, of the input
- /// signal samples in the inSig array. See above.
- ///
- ///
- /// This is the number of samples in the input signal
- /// before the first sample to filter that can be used for overlap. See
- /// above.
- ///
- ///
- /// This is the number of samples in the input signal
- /// after the last sample to filter that can be used for overlap. See
- /// above.
- ///
- ///
- /// This is the array where the low-pass output signal is
- /// placed. It must be of the same type as inSig and it should be long
- /// enough to contain the output signal.
- ///
- ///
- /// This is the index in lowSig of the element where to put
- /// the first low-pass output sample.
- ///
- ///
- /// This is the step, or interleave factor, of the low-pass
- /// output samples in the lowSig array. See above.
- ///
- ///
- /// This is the array where the high-pass output signal is
- /// placed. It must be of the same type as inSig and it should be long
- /// enough to contain the output signal.
- ///
- ///
- /// This is the index in highSig of the element where to put
- /// the first high-pass output sample.
- ///
- ///
- /// This is the step, or interleave factor, of the
- /// high-pass output samples in the highSig array. See above.
- ///
- ///
- ///
- ///
- ///
- public abstract void analyze_lpf(System.Object inSig, int inOff, int inLen, int inStep, System.Object lowSig, int lowOff, int lowStep, System.Object highSig, int highOff, int highStep);
-
- /// Filters the input signal by this analysis filter, decomposing it in a
- /// low-pass and a high-pass signal. This method performs the filtering and
- /// the subsampling with the high pass first filtering convention.
- ///
- /// The input signal resides in the inSig array. The index of the first
- /// sample to filter (i.e. that will generate the first high-pass output
- /// sample) is given by inOff. The number of samples to filter is given by
- /// inLen. This array must be of the same type as the one for which the
- /// particular implementation works with (which is returned by the
- /// getDataType() method).
- ///
- /// The input signal can be interleaved with other signals in the same
- /// inSig array, and this is determined by the inStep argument. This means
- /// that the first sample of the input signal is inSig[inOff], the second
- /// is inSig[inOff+inStep], the third is inSig[inOff+2*inStep], and so
- /// on. Therefore if inStep is 1 there is no interleaving. This feature
- /// allows to filter columns of a 2-D signal, when it is stored in a line
- /// by line order in inSig, without having to copy the data, in this case
- /// the inStep argument should be the line width.
- ///
- /// The low-pass output signal is placed in the lowSig array. The lowOff
- /// and lowStep arguments are analogous to the inOff and inStep ones, but
- /// they apply to the lowSig array. The lowSig array must be long enough to
- /// hold the low-pass output signal.
- ///
- /// The high-pass output signal is placed in the highSig array. The
- /// highOff and highStep arguments are analogous to the inOff and inStep
- /// ones, but they apply to the highSig array. The highSig array must be
- /// long enough to hold the high-pass output signal.
- ///
- ///
- /// This is the array that contains the input signal. It must
- /// be of the correct type (e.g., it must be int[] if getDataType() returns
- /// TYPE_INT).
- ///
- ///
- /// This is the index in inSig of the first sample to filter.
- ///
- ///
- /// This is the number of samples in the input signal to
- /// filter.
- ///
- ///
- /// This is the step, or interleave factor, of the input
- /// signal samples in the inSig array. See above.
- ///
- ///
- /// This is the array where the low-pass output signal is
- /// placed. It must be of the same type as inSig and it should be long
- /// enough to contain the output signal.
- ///
- ///
- /// This is the index in lowSig of the element where to put
- /// the first low-pass output sample.
- ///
- ///
- /// This is the step, or interleave factor, of the low-pass
- /// output samples in the lowSig array. See above.
- ///
- ///
- /// This is the array where the high-pass output signal is
- /// placed. It must be of the same type as inSig and it should be long
- /// enough to contain the output signal.
- ///
- ///
- /// This is the index in highSig of the element where to put
- /// the first high-pass output sample.
- ///
- ///
- /// This is the step, or interleave factor, of the
- /// high-pass output samples in the highSig array. See above.
- ///
- ///
- ///
- ///
- ///
- public abstract void analyze_hpf(System.Object inSig, int inOff, int inLen, int inStep, System.Object lowSig, int lowOff, int lowStep, System.Object highSig, int highOff, int highStep);
-
- /// Returns the time-reversed low-pass synthesis waveform of the filter,
- /// which is the low-pass filter. This is the time-reversed impulse
- /// response of the low-pass synthesis filter. It is used to calculate the
- /// L2-norm of the synthesis basis functions for a particular subband (also
- /// called energy weight).
- ///
- /// The returned array may not be modified (i.e. a reference to the
- /// internal array may be returned by the implementation of this
- /// method).
- ///
- ///
- /// The time-reversed low-pass synthesis waveform of the filter.
- ///
- ///
- public abstract float[] getLPSynthesisFilter();
-
- /// Returns the time-reversed high-pass synthesis waveform of the filter,
- /// which is the high-pass filter. This is the time-reversed impulse
- /// response of the high-pass synthesis filter. It is used to calculate the
- /// L2-norm of the synthesis basis functions for a particular subband (also
- /// called energy weight).
- ///
- /// The returned array may not be modified (i.e. a reference to the
- /// internal array may be returned by the implementation of this
- /// method).
- ///
- ///
- /// The time-reversed high-pass synthesis waveform of the filter.
- ///
- ///
- public abstract float[] getHPSynthesisFilter();
-
- /// Returns the equivalent low-pass synthesis waveform of a cascade of
- /// filters, given the syhthesis waveform of the previous stage. This is
- /// the result of upsampling 'in' by 2, and concolving it with the low-pass
- /// synthesis waveform of the filter. The length of the returned signal is
- /// 2*in_l+lp_l-2, where in_l is the length of 'in' and 'lp_l' is the
- /// lengthg of the low-pass synthesis filter.
- ///
- /// The length of the low-pass synthesis filter is
- /// getSynLowNegSupport()+getSynLowPosSupport().
- ///
- ///
- /// The synthesis waveform of the previous stage.
- ///
- ///
- /// If non-null this array is used to store the resulting
- /// signal. It must be long enough, or an IndexOutOfBoundsException is
- /// thrown.
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public virtual float[] getLPSynWaveForm(float[] in_Renamed, float[] out_Renamed)
- {
- return upsampleAndConvolve(in_Renamed, getLPSynthesisFilter(), out_Renamed);
- }
-
- /// Returns the equivalent high-pass synthesis waveform of a cascade of
- /// filters, given the syhthesis waveform of the previous stage. This is
- /// the result of upsampling 'in' by 2, and concolving it with the
- /// high-pass synthesis waveform of the filter. The length of the returned
- /// signal is 2*in_l+hp_l-2, where in_l is the length of 'in' and 'hp_l' is
- /// the lengthg of the high-pass synthesis filter.
- ///
- /// The length of the high-pass synthesis filter is
- /// getSynHighNegSupport()+getSynHighPosSupport().
- ///
- ///
- /// The synthesis waveform of the previous stage.
- ///
- ///
- /// If non-null this array is used to store the resulting
- /// signal. It must be long enough, or an IndexOutOfBoundsException is
- /// thrown.
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public virtual float[] getHPSynWaveForm(float[] in_Renamed, float[] out_Renamed)
- {
- return upsampleAndConvolve(in_Renamed, getHPSynthesisFilter(), out_Renamed);
- }
-
- /// Returns the signal resulting of upsampling (by 2) the input signal 'in'
- /// and then convolving it with the time-reversed signal 'wf'. The returned
- /// signal is of length l_in*2+l_wf-2, where l_in is the length of 'in',
- /// and l_wf is the length of 'wf'.
- ///
- /// The 'wf' signal has to be already time-reversed, therefore only a
- /// dot-product is performed (instead of a convolution). This is equivalent
- /// to convolving with the non-time-reversed 'wf' signal.
- ///
- ///
- /// The signal to upsample and filter. If null it is considered
- /// to be a dirac.
- ///
- ///
- /// The time-reversed impulse response used for filtering.
- ///
- ///
- /// If non-null this array is used to store the resulting
- /// signal, it must be of length in.length*2+wf.length-2 at least. An
- /// IndexOutOfBoundsException is thrown if this is not the case.
- ///
- ///
- /// The resulting signal, of length in.length*2+wf.length-2
- ///
- ///
- private static float[] upsampleAndConvolve(float[] in_Renamed, float[] wf, float[] out_Renamed)
- {
- // NOTE: the effective length of the signal 'in' upsampled by
- // 2 is 2*in.length-1 (not 2*in.length), so the resulting signal
- // (after convolution) is of length 2*in.length-1+wf.length-1,
- // which is 2*in.length+wf.length-2
-
- int i, k, j;
- float tmp;
- int maxi, maxk;
-
- // If in null, then simulate dirac
- if (in_Renamed == null)
- {
- in_Renamed = new float[1];
- in_Renamed[0] = 1.0f;
- }
-
- // Get output buffer if necessary
- if (out_Renamed == null)
- {
- out_Renamed = new float[in_Renamed.Length * 2 + wf.Length - 2];
- }
- // Convolve the signals
- for (i = 0, maxi = in_Renamed.Length * 2 + wf.Length - 2; i < maxi; i++)
- {
- tmp = 0.0f;
-
- // Calculate limits of loop below
- k = (i - wf.Length + 2) / 2;
- if (k < 0)
- k = 0;
- maxk = i / 2 + 1;
- if (maxk > in_Renamed.Length)
- maxk = in_Renamed.Length;
-
- // Calculate dot-product with upsampling of 'in' by 2.
- for (j = 2 * k - i + wf.Length - 1; k < maxk; k++, j += 2)
- {
- tmp += in_Renamed[k] * wf[j];
- }
- // Store result
- out_Renamed[i] = tmp;
- }
-
- return out_Renamed;
- }
- public abstract bool isSameAsFullWT(int param1, int param2, int param3);
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/wavelet/analysis/AnWTFilterFloat.cs b/CSJ2K/j2k/wavelet/analysis/AnWTFilterFloat.cs
deleted file mode 100644
index 68a48b98..00000000
--- a/CSJ2K/j2k/wavelet/analysis/AnWTFilterFloat.cs
+++ /dev/null
@@ -1,310 +0,0 @@
-/*
-* CVS identifier:
-*
-* $Id: AnWTFilterFloat.java,v 1.7 2000/09/05 09:25:37 grosbois Exp $
-*
-* Class: AnWTFilterFloat
-*
-* Description: A specialized wavelet filter interface that
-* works on float data.
-*
-*
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-*
-*
-*
-*/
-using CSJ2K.j2k.image;
-namespace CSJ2K.j2k.wavelet.analysis
-{
-
- /// This extends the analysis wavelet filter general definitions of
- /// AnWTFilter by adding methods that work for float data
- /// specifically. Implementations that work on float data should inherit
- /// from this class.
- ///
- /// See the AnWTFilter class for details such as
- /// normalization, how to split odd-length signals, etc.
- ///
- ///
The advantage of using the specialized method is that no casts
- /// are performed.
- ///
- ///
- ///
- ///
- ///
- public abstract class AnWTFilterFloat : AnWTFilter
- {
- /// Returns the type of data on which this filter works, as defined
- /// in the DataBlk interface, which is always TYPE_FLOAT for this
- /// class.
- ///
- ///
- /// The type of data as defined in the DataBlk interface.
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- override public int DataType
- {
- get
- {
- return DataBlk.TYPE_FLOAT;
- }
-
- }
-
- /// A specific version of the analyze_lpf() method that works on int
- /// data. See the general description of the analyze_lpf() method in
- /// the AnWTFilter class for more details.
- ///
- ///
- /// This is the array that contains the input
- /// signal.
- ///
- ///
- /// This is the index in inSig of the first sample to
- /// filter.
- ///
- ///
- /// This is the number of samples in the input signal
- /// to filter.
- ///
- ///
- /// This is the step, or interleave factor, of the
- /// input signal samples in the inSig array.
- ///
- ///
- /// This is the array where the low-pass output
- /// signal is placed.
- ///
- ///
- /// This is the index in lowSig of the element where
- /// to put the first low-pass output sample.
- ///
- ///
- /// This is the step, or interleave factor, of the
- /// low-pass output samples in the lowSig array.
- ///
- ///
- /// This is the array where the high-pass output
- /// signal is placed.
- ///
- ///
- /// This is the index in highSig of the element where
- /// to put the first high-pass output sample.
- ///
- ///
- /// This is the step, or interleave factor, of the
- /// high-pass output samples in the highSig array.
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public abstract void analyze_lpf(float[] inSig, int inOff, int inLen, int inStep, float[] lowSig, int lowOff, int lowStep, float[] highSig, int highOff, int highStep);
-
- /// The general version of the analyze_lpf() method, it just calls the
- /// specialized version. See the description of the analyze_lpf()
- /// method of the AnWTFilter class for more details.
- ///
- ///
- /// This is the array that contains the input
- /// signal. It must be an float[].
- ///
- ///
- /// This is the index in inSig of the first sample to
- /// filter.
- ///
- ///
- /// This is the number of samples in the input signal
- /// to filter.
- ///
- ///
- /// This is the step, or interleave factor, of the
- /// input signal samples in the inSig array.
- ///
- ///
- /// This is the array where the low-pass output
- /// signal is placed. It must be an float[].
- ///
- ///
- /// This is the index in lowSig of the element where
- /// to put the first low-pass output sample.
- ///
- ///
- /// This is the step, or interleave factor, of the
- /// low-pass output samples in the lowSig array.
- ///
- ///
- /// This is the array where the high-pass output
- /// signal is placed. It must be an float[].
- ///
- ///
- /// This is the index in highSig of the element where
- /// to put the first high-pass output sample.
- ///
- ///
- /// This is the step, or interleave factor, of the
- /// high-pass output samples in the highSig array.
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public override void analyze_lpf(System.Object inSig, int inOff, int inLen, int inStep, System.Object lowSig, int lowOff, int lowStep, System.Object highSig, int highOff, int highStep)
- {
-
- analyze_lpf((float[])inSig, inOff, inLen, inStep, (float[])lowSig, lowOff, lowStep, (float[])highSig, highOff, highStep);
- }
-
- /// A specific version of the analyze_hpf() method that works on int
- /// data. See the general description of the analyze_hpf() method in the
- /// AnWTFilter class for more details.
- ///
- ///
- /// This is the array that contains the input
- /// signal.
- ///
- ///
- /// This is the index in inSig of the first sample to
- /// filter.
- ///
- ///
- /// This is the number of samples in the input signal
- /// to filter.
- ///
- ///
- /// This is the step, or interleave factor, of the
- /// input signal samples in the inSig array.
- ///
- ///
- /// This is the array where the low-pass output
- /// signal is placed.
- ///
- ///
- /// This is the index in lowSig of the element where
- /// to put the first low-pass output sample.
- ///
- ///
- /// This is the step, or interleave factor, of the
- /// low-pass output samples in the lowSig array.
- ///
- ///
- /// This is the array where the high-pass output
- /// signal is placed.
- ///
- ///
- /// This is the index in highSig of the element where
- /// to put the first high-pass output sample.
- ///
- ///
- /// This is the step, or interleave factor, of the
- /// high-pass output samples in the highSig array.
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public abstract void analyze_hpf(float[] inSig, int inOff, int inLen, int inStep, float[] lowSig, int lowOff, int lowStep, float[] highSig, int highOff, int highStep);
-
-
-
- /// The general version of the analyze_hpf() method, it just calls the
- /// specialized version. See the description of the analyze_hpf()
- /// method of the AnWTFilter class for more details.
- ///
- ///
- /// This is the array that contains the input
- /// signal. It must be an float[].
- ///
- ///
- /// This is the index in inSig of the first sample to
- /// filter.
- ///
- ///
- /// This is the number of samples in the input signal
- /// to filter.
- ///
- ///
- /// This is the step, or interleave factor, of the
- /// input signal samples in the inSig array.
- ///
- ///
- /// This is the array where the low-pass output
- /// signal is placed. It must be an float[].
- ///
- ///
- /// This is the index in lowSig of the element where
- /// to put the first low-pass output sample.
- ///
- ///
- /// This is the step, or interleave factor, of the
- /// low-pass output samples in the lowSig array.
- ///
- ///
- /// This is the array where the high-pass output
- /// signal is placed. It must be an float[].
- ///
- ///
- /// This is the index in highSig of the element where
- /// to put the first high-pass output sample.
- ///
- ///
- /// This is the step, or interleave factor, of the
- /// high-pass output samples in the highSig array.
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public override void analyze_hpf(System.Object inSig, int inOff, int inLen, int inStep, System.Object lowSig, int lowOff, int lowStep, System.Object highSig, int highOff, int highStep)
- {
-
- analyze_hpf((float[])inSig, inOff, inLen, inStep, (float[])lowSig, lowOff, lowStep, (float[])highSig, highOff, highStep);
- }
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/wavelet/analysis/AnWTFilterFloatLift9x7.cs b/CSJ2K/j2k/wavelet/analysis/AnWTFilterFloatLift9x7.cs
deleted file mode 100644
index 59cf28c8..00000000
--- a/CSJ2K/j2k/wavelet/analysis/AnWTFilterFloatLift9x7.cs
+++ /dev/null
@@ -1,803 +0,0 @@
-/*
-* CVS identifier:
-*
-* $Id: AnWTFilterFloatLift9x7.java,v 1.18 2002/01/22 13:31:31 grosbois Exp $
-*
-* Class: AnWTFilterFloatLift9x7
-*
-* Description: An analyzing wavelet filter implementing the
-* lifting 9x7 transform.
-*
-*
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-* */
-namespace CSJ2K.j2k.wavelet.analysis
-{
-
- /// This class inherits from the analysis wavelet filter definition
- /// for int data. It implements the forward wavelet transform
- /// specifically for the 9x7 filter. The implementation is based on
- /// the lifting scheme.
- ///
- /// See the AnWTFilter class for details such as
- /// normalization, how to split odd-length signals, etc. In particular,
- /// this method assumes that the low-pass coefficient is computed first.
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public class AnWTFilterFloatLift9x7 : AnWTFilterFloat
- {
- /// Returns the negative support of the low-pass analysis
- /// filter. That is the number of taps of the filter in the
- /// negative direction.
- ///
- ///
- /// 2
- ///
- ///
- override public int AnLowNegSupport
- {
- get
- {
- return 4;
- }
-
- }
- /// Returns the positive support of the low-pass analysis
- /// filter. That is the number of taps of the filter in the
- /// negative direction.
- ///
- ///
- /// The number of taps of the low-pass analysis filter in
- /// the positive direction
- ///
- ///
- override public int AnLowPosSupport
- {
- get
- {
- return 4;
- }
-
- }
- /// Returns the negative support of the high-pass analysis
- /// filter. That is the number of taps of the filter in the
- /// negative direction.
- ///
- ///
- /// The number of taps of the high-pass analysis filter in
- /// the negative direction
- ///
- ///
- override public int AnHighNegSupport
- {
- get
- {
- return 3;
- }
-
- }
- /// Returns the positive support of the high-pass analysis
- /// filter. That is the number of taps of the filter in the
- /// negative direction.
- ///
- ///
- /// The number of taps of the high-pass analysis filter in
- /// the positive direction
- ///
- ///
- override public int AnHighPosSupport
- {
- get
- {
- return 3;
- }
-
- }
- /// Returns the negative support of the low-pass synthesis
- /// filter. That is the number of taps of the filter in the
- /// negative direction.
- ///
- /// A MORE PRECISE DEFINITION IS NEEDED
- ///
- ///
- /// The number of taps of the low-pass synthesis filter in
- /// the negative direction
- ///
- ///
- override public int SynLowNegSupport
- {
- get
- {
- return 3;
- }
-
- }
- /// Returns the positive support of the low-pass synthesis
- /// filter. That is the number of taps of the filter in the
- /// negative direction.
- ///
- /// A MORE PRECISE DEFINITION IS NEEDED
- ///
- ///
- /// The number of taps of the low-pass synthesis filter in
- /// the positive direction
- ///
- ///
- override public int SynLowPosSupport
- {
- get
- {
- return 3;
- }
-
- }
- /// Returns the negative support of the high-pass synthesis
- /// filter. That is the number of taps of the filter in the
- /// negative direction.
- ///
- /// A MORE PRECISE DEFINITION IS NEEDED
- ///
- ///
- /// The number of taps of the high-pass synthesis filter in
- /// the negative direction
- ///
- ///
- override public int SynHighNegSupport
- {
- get
- {
- return 4;
- }
-
- }
- /// Returns the positive support of the high-pass synthesis
- /// filter. That is the number of taps of the filter in the
- /// negative direction.
- ///
- /// A MORE PRECISE DEFINITION IS NEEDED
- ///
- ///
- /// The number of taps of the high-pass synthesis filter in
- /// the positive direction
- ///
- ///
- override public int SynHighPosSupport
- {
- get
- {
- return 4;
- }
-
- }
- /// Returns the implementation type of this filter, as defined in
- /// this class, such as WT_FILTER_INT_LIFT, WT_FILTER_FLOAT_LIFT,
- /// WT_FILTER_FLOAT_CONVOL.
- ///
- ///
- /// WT_FILTER_INT_LIFT.
- ///
- ///
- override public int ImplType
- {
- get
- {
- return CSJ2K.j2k.wavelet.WaveletFilter_Fields.WT_FILTER_FLOAT_LIFT;
- }
-
- }
- /// Returns the reversibility of the filter. A filter is considered
- /// reversible if it is suitable for lossless coding.
- ///
- ///
- /// true since the 9x7 is reversible, provided the appropriate
- /// rounding is performed.
- ///
- ///
- override public bool Reversible
- {
- get
- {
- return false;
- }
-
- }
- /// Returns the type of filter used according to the FilterTypes
- /// interface(W9x7).
- ///
- ///
- ///
- ///
- ///
- /// The filter type.
- ///
- ///
- override public int FilterType
- {
- get
- {
- return CSJ2K.j2k.wavelet.FilterTypes_Fields.W9X7;
- }
-
- }
-
- /// The low-pass synthesis filter of the 9x7 wavelet transform
- //UPGRADE_NOTE: Final was removed from the declaration of 'LPSynthesisFilter'. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private static readonly float[] LPSynthesisFilter = new float[] { -0.091272f, -0.057544f, 0.591272f, 1.115087f, 0.591272f, -0.057544f, -0.091272f };
-
- /// The high-pass synthesis filter of the 9x7 wavelet transform
- //UPGRADE_NOTE: Final was removed from the declaration of 'HPSynthesisFilter'. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private static readonly float[] HPSynthesisFilter = new float[] { 0.026749f, 0.016864f, -0.078223f, -0.266864f, 0.602949f, -0.266864f, -0.078223f, 0.016864f, 0.026749f };
-
- /// The value of the first lifting step coefficient
- public const float ALPHA = -1.586134342f;
-
- /// The value of the second lifting step coefficient
- public const float BETA = -0.05298011854f;
-
- /// The value of the third lifting step coefficient
- public const float GAMMA = 0.8829110762f;
-
- /// The value of the fourth lifting step coefficient
- public const float DELTA = 0.4435068522f;
-
- /// The value of the low-pass subband normalization factor
- public const float KL = 0.8128930655f;
-
- /// The value of the high-pass subband normalization factor
- public const float KH = 1.230174106f;
-
- /// An implementation of the analyze_lpf() method that works on int
- /// data, for the forward 9x7 wavelet transform using the
- /// lifting scheme. See the general description of the analyze_lpf()
- /// method in the AnWTFilter class for more details.
- ///
- /// The coefficients of the first lifting step are [ALPHA 1 ALPHA].
- ///
- ///
The coefficients of the second lifting step are [BETA 1 BETA].
- ///
- ///
The coefficients of the third lifting step are [GAMMA 1 GAMMA].
- ///
- ///
The coefficients of the fourth lifting step are [DELTA 1 DELTA].
- ///
- ///
The low-pass and high-pass subbands are normalized by respectively
- /// a factor of KL and a factor of KH
- ///
- ///
- /// This is the array that contains the input
- /// signal.
- ///
- ///
- /// This is the index in inSig of the first sample to
- /// filter.
- ///
- ///
- /// This is the number of samples in the input signal
- /// to filter.
- ///
- ///
- /// This is the step, or interleave factor, of the
- /// input signal samples in the inSig array.
- ///
- ///
- /// This is the array where the low-pass output
- /// signal is placed.
- ///
- ///
- /// This is the index in lowSig of the element where
- /// to put the first low-pass output sample.
- ///
- ///
- /// This is the step, or interleave factor, of the
- /// low-pass output samples in the lowSig array.
- ///
- ///
- /// This is the array where the high-pass output
- /// signal is placed.
- ///
- ///
- /// This is the index in highSig of the element where
- /// to put the first high-pass output sample.
- ///
- ///
- /// This is the step, or interleave factor, of the
- /// high-pass output samples in the highSig array.
- ///
- ///
- public override void analyze_lpf(float[] inSig, int inOff, int inLen, int inStep, float[] lowSig, int lowOff, int lowStep, float[] highSig, int highOff, int highStep)
- {
- int i, maxi;
- int iStep = 2 * inStep; //Subsampling in inSig
- int ik; //Indexing inSig
- int lk; //Indexing lowSig
- int hk; //Indexing highSig
-
- // Generate intermediate high frequency subband
-
- //Initialize counters
- ik = inOff + inStep;
- lk = lowOff;
- hk = highOff;
-
- //Apply first lifting step to each "inner" sample
- for (i = 1, maxi = inLen - 1; i < maxi; i += 2)
- {
- highSig[hk] = inSig[ik] + ALPHA * (inSig[ik - inStep] + inSig[ik + inStep]);
-
- ik += iStep;
- hk += highStep;
- }
-
- //Handle head boundary effect if input signal has even length
- if (inLen % 2 == 0)
- {
- highSig[hk] = inSig[ik] + 2 * ALPHA * inSig[ik - inStep];
- }
-
- // Generate intermediate low frequency subband
-
- //Initialize counters
- ik = inOff;
- lk = lowOff;
- hk = highOff;
-
- if (inLen > 1)
- {
- lowSig[lk] = inSig[ik] + 2 * BETA * highSig[hk];
- }
- else
- {
- lowSig[lk] = inSig[ik];
- }
-
- ik += iStep;
- lk += lowStep;
- hk += highStep;
-
- //Apply lifting step to each "inner" sample
- for (i = 2, maxi = inLen - 1; i < maxi; i += 2)
- {
- lowSig[lk] = inSig[ik] + BETA * (highSig[hk - highStep] + highSig[hk]);
-
- ik += iStep;
- lk += lowStep;
- hk += highStep;
- }
-
- //Handle head boundary effect if input signal has odd length
- if ((inLen % 2 == 1) && (inLen > 2))
- {
- lowSig[lk] = inSig[ik] + 2 * BETA * highSig[hk - highStep];
- }
-
- // Generate high frequency subband
-
- //Initialize counters
- lk = lowOff;
- hk = highOff;
-
- //Apply first lifting step to each "inner" sample
- for (i = 1, maxi = inLen - 1; i < maxi; i += 2)
- {
- highSig[hk] += GAMMA * (lowSig[lk] + lowSig[lk + lowStep]);
-
- lk += lowStep;
- hk += highStep;
- }
-
- //Handle head boundary effect if input signal has even length
- if (inLen % 2 == 0)
- {
- highSig[hk] += 2 * GAMMA * lowSig[lk];
- }
-
- // Generate low frequency subband
-
- //Initialize counters
- lk = lowOff;
- hk = highOff;
-
- //Handle tail boundary effect
- //If access the overlap then perform the lifting step
- if (inLen > 1)
- {
- lowSig[lk] += 2 * DELTA * highSig[hk];
- }
-
- lk += lowStep;
- hk += highStep;
-
- //Apply lifting step to each "inner" sample
- for (i = 2, maxi = inLen - 1; i < maxi; i += 2)
- {
- lowSig[lk] += DELTA * (highSig[hk - highStep] + highSig[hk]);
-
- lk += lowStep;
- hk += highStep;
- }
-
- //Handle head boundary effect if input signal has odd length
- if ((inLen % 2 == 1) && (inLen > 2))
- {
- lowSig[lk] += 2 * DELTA * highSig[hk - highStep];
- }
-
- // Normalize low and high frequency subbands
-
- //Re-initialize counters
- lk = lowOff;
- hk = highOff;
-
- //Normalize each sample
- for (i = 0; i < (inLen >> 1); i++)
- {
- lowSig[lk] *= KL;
- highSig[hk] *= KH;
- lk += lowStep;
- hk += highStep;
- }
- //If the input signal has odd length then normalize the last low-pass
- //coefficient (if input signal is length one filter is identity)
- if (inLen % 2 == 1 && inLen != 1)
- {
- lowSig[lk] *= KL;
- }
- }
-
- /// An implementation of the analyze_hpf() method that works on int
- /// data, for the forward 9x7 wavelet transform using the
- /// lifting scheme. See the general description of the analyze_hpf() method
- /// in the AnWTFilter class for more details.
- ///
- /// The coefficients of the first lifting step are [ALPHA 1 ALPHA].
- ///
- ///
The coefficients of the second lifting step are [BETA 1 BETA].
- ///
- ///
The coefficients of the third lifting step are [GAMMA 1 GAMMA].
- ///
- ///
The coefficients of the fourth lifting step are [DELTA 1 DELTA].
- ///
- ///
The low-pass and high-pass subbands are normalized by respectively
- /// a factor of KL and a factor of KH
- ///
- ///
- /// This is the array that contains the input
- /// signal.
- ///
- ///
- /// This is the index in inSig of the first sample to
- /// filter.
- ///
- ///
- /// This is the number of samples in the input signal
- /// to filter.
- ///
- ///
- /// This is the step, or interleave factor, of the
- /// input signal samples in the inSig array.
- ///
- ///
- /// This is the array where the low-pass output
- /// signal is placed.
- ///
- ///
- /// This is the index in lowSig of the element where
- /// to put the first low-pass output sample.
- ///
- ///
- /// This is the step, or interleave factor, of the
- /// low-pass output samples in the lowSig array.
- ///
- ///
- /// This is the array where the high-pass output
- /// signal is placed.
- ///
- ///
- /// This is the index in highSig of the element where
- /// to put the first high-pass output sample.
- ///
- ///
- /// This is the step, or interleave factor, of the
- /// high-pass output samples in the highSig array.
- ///
- ///
- ///
- ///
- ///
- public override void analyze_hpf(float[] inSig, int inOff, int inLen, int inStep, float[] lowSig, int lowOff, int lowStep, float[] highSig, int highOff, int highStep)
- {
-
- int i; // maxi removed
- int iStep = 2 * inStep; //Subsampling in inSig
- int ik; //Indexing inSig
- int lk; //Indexing lowSig
- int hk; //Indexing highSig
-
- // Generate intermediate high frequency subband
-
- //Initialize counters
- ik = inOff;
- lk = lowOff;
- hk = highOff;
-
- if (inLen > 1)
- {
- // apply symmetric extension.
- highSig[hk] = inSig[ik] + 2 * ALPHA * inSig[ik + inStep];
- }
- else
- {
- // Normalize for Nyquist gain
- highSig[hk] = inSig[ik] * 2;
- }
-
- ik += iStep;
- hk += highStep;
-
- //Apply first lifting step to each "inner" sample
- for (i = 2; i < inLen - 1; i += 2)
- {
- highSig[hk] = inSig[ik] + ALPHA * (inSig[ik - inStep] + inSig[ik + inStep]);
- ik += iStep;
- hk += highStep;
- }
-
- //If input signal has odd length then we perform the lifting step
- // i.e. apply a symmetric extension.
- if ((inLen % 2 == 1) && (inLen > 1))
- {
- highSig[hk] = inSig[ik] + 2 * ALPHA * inSig[ik - inStep];
- }
-
- // Generate intermediate low frequency subband
-
- //Initialize counters
- //ik = inOff + inStep;
- ik = inOff + inStep;
- lk = lowOff;
- hk = highOff;
-
- //Apply lifting step to each "inner" sample
- // we are at the component boundary
- for (i = 1; i < inLen - 1; i += 2)
- {
- lowSig[lk] = inSig[ik] + BETA * (highSig[hk] + highSig[hk + highStep]);
-
- ik += iStep;
- lk += lowStep;
- hk += highStep;
- }
- if (inLen > 1 && inLen % 2 == 0)
- {
- // symetric extension
- lowSig[lk] = inSig[ik] + 2 * BETA * highSig[hk];
- }
-
- // Generate high frequency subband
-
- //Initialize counters
- lk = lowOff;
- hk = highOff;
-
- if (inLen > 1)
- {
- // symmetric extension.
- highSig[hk] += GAMMA * 2 * lowSig[lk];
- }
- //lk += lowStep;
- hk += highStep;
-
- //Apply first lifting step to each "inner" sample
- for (i = 2; i < inLen - 1; i += 2)
- {
- highSig[hk] += GAMMA * (lowSig[lk] + lowSig[lk + lowStep]);
- lk += lowStep;
- hk += highStep;
- }
-
- //Handle head boundary effect
- if (inLen > 1 && inLen % 2 == 1)
- {
- // symmetric extension.
- highSig[hk] += GAMMA * 2 * lowSig[lk];
- }
-
- // Generate low frequency subband
-
- //Initialize counters
- lk = lowOff;
- hk = highOff;
-
- // we are at the component boundary
- for (i = 1; i < inLen - 1; i += 2)
- {
- lowSig[lk] += DELTA * (highSig[hk] + highSig[hk + highStep]);
- lk += lowStep;
- hk += highStep;
- }
-
- if (inLen > 1 && inLen % 2 == 0)
- {
- lowSig[lk] += DELTA * 2 * highSig[hk];
- }
-
- // Normalize low and high frequency subbands
-
- //Re-initialize counters
- lk = lowOff;
- hk = highOff;
-
- //Normalize each sample
- for (i = 0; i < (inLen >> 1); i++)
- {
- lowSig[lk] *= KL;
- highSig[hk] *= KH;
- lk += lowStep;
- hk += highStep;
- }
- //If the input signal has odd length then normalize the last high-pass
- //coefficient (if input signal is length one filter is identity)
- if (inLen % 2 == 1 && inLen != 1)
- {
- highSig[hk] *= KH;
- }
- }
-
- /// Returns the time-reversed low-pass synthesis waveform of the
- /// filter, which is the low-pass filter. This is the time-reversed
- /// impulse response of the low-pass synthesis filter. It is used
- /// to calculate the L2-norm of the synthesis basis functions for a
- /// particular subband (also called energy weight).
- ///
- /// The returned array may not be modified (i.e. a reference to
- /// the internal array may be returned by the implementation of
- /// this method).
- ///
- ///
- /// The time-reversed low-pass synthesis waveform of the
- /// filter.
- ///
- ///
- public override float[] getLPSynthesisFilter()
- {
- return LPSynthesisFilter;
- }
-
- /// Returns the time-reversed high-pass synthesis waveform of the
- /// filter, which is the high-pass filter. This is the
- /// time-reversed impulse response of the high-pass synthesis
- /// filter. It is used to calculate the L2-norm of the synthesis
- /// basis functions for a particular subband (also called energy
- /// weight).
- ///
- /// The returned array may not be modified (i.e. a reference to
- /// the internal array may be returned by the implementation of
- /// this method).
- ///
- ///
- /// The time-reversed high-pass synthesis waveform of the
- /// filter.
- ///
- ///
- public override float[] getHPSynthesisFilter()
- {
- return HPSynthesisFilter;
- }
-
- /// Returns true if the wavelet filter computes or uses the
- /// same "inner" subband coefficient as the full frame wavelet transform,
- /// and false otherwise. In particular, for block based transforms with
- /// reduced overlap, this method should return false. The term "inner"
- /// indicates that this applies only with respect to the coefficient that
- /// are not affected by image boundaries processings such as symmetric
- /// extension, since there is not reference method for this.
- ///
- /// The result depends on the length of the allowed overlap when
- /// compared to the overlap required by the wavelet filter. It also
- /// depends on how overlap processing is implemented in the wavelet
- /// filter.
- ///
- ///
- /// This is the number of samples in the input
- /// signal before the first sample to filter that can be used for
- /// overlap.
- ///
- ///
- /// This is the number of samples in the input
- /// signal after the last sample to filter that can be used for
- /// overlap.
- ///
- ///
- /// This is the lenght of the input signal to filter.The
- /// required number of samples in the input signal after the last sample
- /// depends on the length of the input signal.
- ///
- ///
- /// true if both overlaps are greater than 2, and correct
- /// processing is applied in the analyze() method.
- ///
- ///
- public override bool isSameAsFullWT(int tailOvrlp, int headOvrlp, int inLen)
- {
-
- //If the input signal has even length.
- if (inLen % 2 == 0)
- {
- if (tailOvrlp >= 4 && headOvrlp >= 3)
- return true;
- else
- return false;
- }
- //Else if the input signal has odd length.
- else
- {
- if (tailOvrlp >= 4 && headOvrlp >= 4)
- return true;
- else
- return false;
- }
- }
-
- /// Tests if the 'obj' object is the same filter as this one. Two filters
- /// are the same if the same filter code should be output for both filters
- /// by the encodeFilterCode() method.
- ///
- /// Currently the implementation of this method only tests if 'obj' is
- /// also of the class AnWTFilterFloatLift9x7
- ///
- ///
- /// object against which to test inequality.
- ///
- ///
- public override bool Equals(System.Object obj)
- {
- // To spped up test, first test for reference equality
- return obj == this || obj is AnWTFilterFloatLift9x7;
- }
-
- /// Debugging method
- public override System.String ToString()
- {
- return "w9x7";
- }
- //UPGRADE_NOTE: The following method implementation was automatically added to preserve functionality. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1306'"
- public override int GetHashCode()
- {
- return base.GetHashCode();
- }
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/wavelet/analysis/AnWTFilterInt.cs b/CSJ2K/j2k/wavelet/analysis/AnWTFilterInt.cs
deleted file mode 100644
index 25567cca..00000000
--- a/CSJ2K/j2k/wavelet/analysis/AnWTFilterInt.cs
+++ /dev/null
@@ -1,315 +0,0 @@
-/*
-* CVS identifier:
-*
-* $Id: AnWTFilterInt.java,v 1.7 2000/09/05 09:25:42 grosbois Exp $
-*
-* Class: AnWTFilterInt
-*
-* Description: A specialized wavelet filter interface that
-* works on int data.
-*
-*
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-*
-*
-*
-*/
-using CSJ2K.j2k.image;
-namespace CSJ2K.j2k.wavelet.analysis
-{
-
- /// This extends the analysis wavelet filter general definitions of
- /// AnWTFilter by adding methods that work for int data
- /// specifically. Implementations that work on int data should inherit
- /// from this class.
- ///
- /// See the AnWTFilter class for details such as
- /// normalization, how to split odd-length signals, etc.
- ///
- ///
The advantage of using the specialized method is that no casts
- /// are performed.
- ///
- ///
- ///
- ///
- ///
- public abstract class AnWTFilterInt : AnWTFilter
- {
- /// Returns the type of data on which this filter works, as defined
- /// in the DataBlk interface, which is always TYPE_INT for this
- /// class.
- ///
- ///
- /// The type of data as defined in the DataBlk interface.
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- override public int DataType
- {
- get
- {
- return DataBlk.TYPE_INT;
- }
-
- }
-
- /// A specific version of the analyze_lpf() method that works on int
- /// data. See the general description of the analyze_lpf() method in
- /// the AnWTFilter class for more details.
- ///
- ///
- /// This is the array that contains the input
- /// signal.
- ///
- ///
- /// This is the index in inSig of the first sample to
- /// filter.
- ///
- ///
- /// This is the number of samples in the input signal
- /// to filter.
- ///
- ///
- /// This is the step, or interleave factor, of the
- /// input signal samples in the inSig array.
- ///
- ///
- /// This is the array where the low-pass output
- /// signal is placed.
- ///
- ///
- /// This is the index in lowSig of the element where
- /// to put the first low-pass output sample.
- ///
- ///
- /// This is the step, or interleave factor, of the
- /// low-pass output samples in the lowSig array.
- ///
- ///
- /// This is the array where the high-pass output
- /// signal is placed.
- ///
- ///
- /// This is the index in highSig of the element where
- /// to put the first high-pass output sample.
- ///
- ///
- /// This is the step, or interleave factor, of the
- /// high-pass output samples in the highSig array.
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public abstract void analyze_lpf(int[] inSig, int inOff, int inLen, int inStep, int[] lowSig, int lowOff, int lowStep, int[] highSig, int highOff, int highStep);
-
- /// The general version of the analyze_lpf() method, it just calls the
- /// specialized version. See the description of the analyze_lpf()
- /// method of the AnWTFilter class for more details.
- ///
- ///
- /// This is the array that contains the input
- /// signal. It must be an int[].
- ///
- ///
- /// This is the index in inSig of the first sample to
- /// filter.
- ///
- ///
- /// This is the number of samples in the input signal
- /// to filter.
- ///
- ///
- /// This is the step, or interleave factor, of the
- /// input signal samples in the inSig array.
- ///
- ///
- /// This is the array where the low-pass output
- /// signal is placed. It must be an int[].
- ///
- ///
- /// This is the index in lowSig of the element where
- /// to put the first low-pass output sample.
- ///
- ///
- /// This is the step, or interleave factor, of the
- /// low-pass output samples in the lowSig array.
- ///
- ///
- /// This is the array where the high-pass output
- /// signal is placed. It must be an int[].
- ///
- ///
- /// This is the index in highSig of the element where
- /// to put the first high-pass output sample.
- ///
- ///
- /// This is the step, or interleave factor, of the
- /// high-pass output samples in the highSig array.
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
-
- public override void analyze_lpf(System.Object inSig, int inOff, int inLen, int inStep, System.Object lowSig, int lowOff, int lowStep, System.Object highSig, int highOff, int highStep)
- {
-
- analyze_lpf((int[])inSig, inOff, inLen, inStep, (int[])lowSig, lowOff, lowStep, (int[])highSig, highOff, highStep);
- }
-
- /// A specific version of the analyze_hpf() method that works on int
- /// data. See the general description of the analyze_hpf() method in
- /// the AnWTFilter class for more details.
- ///
- ///
- /// This is the array that contains the input
- /// signal.
- ///
- ///
- /// This is the index in inSig of the first sample to
- /// filter.
- ///
- ///
- /// This is the number of samples in the input signal
- /// to filter.
- ///
- ///
- /// This is the step, or interleave factor, of the
- /// input signal samples in the inSig array.
- ///
- ///
- /// This is the array where the low-pass output
- /// signal is placed.
- ///
- ///
- /// This is the index in lowSig of the element where
- /// to put the first low-pass output sample.
- ///
- ///
- /// This is the step, or interleave factor, of the
- /// low-pass output samples in the lowSig array.
- ///
- ///
- /// This is the array where the high-pass output
- /// signal is placed.
- ///
- ///
- /// This is the index in highSig of the element where
- /// to put the first high-pass output sample.
- ///
- ///
- /// This is the step, or interleave factor, of the
- /// high-pass output samples in the highSig array.
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public abstract void analyze_hpf(int[] inSig, int inOff, int inLen, int inStep, int[] lowSig, int lowOff, int lowStep, int[] highSig, int highOff, int highStep);
- /// The general version of the analyze_hpf() method, it just calls the
- /// specialized version. See the description of the analyze_hpf()
- /// method of the AnWTFilter class for more details.
- ///
- ///
- /// This is the array that contains the input
- /// signal. It must be an int[].
- ///
- ///
- /// This is the index in inSig of the first sample to
- /// filter.
- ///
- ///
- /// This is the number of samples in the input signal
- /// to filter.
- ///
- ///
- /// This is the step, or interleave factor, of the
- /// input signal samples in the inSig array.
- ///
- ///
- /// This is the array where the low-pass output
- /// signal is placed. It must be an int[].
- ///
- ///
- /// This is the index in lowSig of the element where
- /// to put the first low-pass output sample.
- ///
- ///
- /// This is the step, or interleave factor, of the
- /// low-pass output samples in the lowSig array.
- ///
- ///
- /// This is the array where the high-pass output
- /// signal is placed. It must be an int[].
- ///
- ///
- /// This is the index in highSig of the element where
- /// to put the first high-pass output sample.
- ///
- ///
- /// This is the step, or interleave factor, of the
- /// high-pass output samples in the highSig array.
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
-
- public override void analyze_hpf(System.Object inSig, int inOff, int inLen, int inStep, System.Object lowSig, int lowOff, int lowStep, System.Object highSig, int highOff, int highStep)
- {
-
- analyze_hpf((int[])inSig, inOff, inLen, inStep, (int[])lowSig, lowOff, lowStep, (int[])highSig, highOff, highStep);
- }
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/wavelet/analysis/AnWTFilterIntLift5x3.cs b/CSJ2K/j2k/wavelet/analysis/AnWTFilterIntLift5x3.cs
deleted file mode 100644
index ef481338..00000000
--- a/CSJ2K/j2k/wavelet/analysis/AnWTFilterIntLift5x3.cs
+++ /dev/null
@@ -1,604 +0,0 @@
-/*
-* CVS identifier:
-*
-* $Id: AnWTFilterIntLift5x3.java,v 1.15 2001/08/02 11:19:27 grosbois Exp $
-*
-* Class: AnWTFilterIntLift5x3
-*
-* Description: An analyzing wavelet filter implementing the
-* lifting 5x3 transform.
-*
-*
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-* */
-namespace CSJ2K.j2k.wavelet.analysis
-{
-
- /// This class inherits from the analysis wavelet filter definition for int
- /// data. It implements the forward wavelet transform specifically for the 5x3
- /// filter. The implementation is based on the lifting scheme.
- ///
- /// See the AnWTFilter class for details such as normalization, how to split
- /// odd-length signals, etc. In particular, this method assumes that the
- /// low-pass coefficient is computed first.
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public class AnWTFilterIntLift5x3 : AnWTFilterInt
- {
- /// Returns the negative support of the low-pass analysis filter. That is
- /// the number of taps of the filter in the negative direction.
- ///
- ///
- /// 2
- ///
- ///
- override public int AnLowNegSupport
- {
- get
- {
- return 2;
- }
-
- }
- /// Returns the positive support of the low-pass analysis filter. That is
- /// the number of taps of the filter in the negative direction.
- ///
- ///
- /// The number of taps of the low-pass analysis filter in the
- /// positive direction
- ///
- ///
- override public int AnLowPosSupport
- {
- get
- {
- return 2;
- }
-
- }
- /// Returns the negative support of the high-pass analysis filter. That is
- /// the number of taps of the filter in the negative direction.
- ///
- ///
- /// The number of taps of the high-pass analysis filter in
- /// the negative direction
- ///
- ///
- override public int AnHighNegSupport
- {
- get
- {
- return 1;
- }
-
- }
- /// Returns the positive support of the high-pass analysis filter. That is
- /// the number of taps of the filter in the negative direction.
- ///
- ///
- /// The number of taps of the high-pass analysis filter in the
- /// positive direction
- ///
- ///
- override public int AnHighPosSupport
- {
- get
- {
- return 1;
- }
-
- }
- /// Returns the negative support of the low-pass synthesis filter. That is
- /// the number of taps of the filter in the negative direction.
- ///
- ///
- /// The number of taps of the low-pass synthesis filter in the
- /// negative direction
- ///
- ///
- override public int SynLowNegSupport
- {
- get
- {
- return 1;
- }
-
- }
- /// Returns the positive support of the low-pass synthesis filter. That is
- /// the number of taps of the filter in the negative direction.
- ///
- ///
- /// The number of taps of the low-pass synthesis filter in
- /// the positive direction
- ///
- ///
- override public int SynLowPosSupport
- {
- get
- {
- return 1;
- }
-
- }
- /// Returns the negative support of the high-pass synthesis filter. That is
- /// the number of taps of the filter in the negative direction.
- ///
- ///
- /// The number of taps of the high-pass synthesis filter in the
- /// negative direction
- ///
- ///
- override public int SynHighNegSupport
- {
- get
- {
- return 2;
- }
-
- }
- /// Returns the positive support of the high-pass synthesis filter. That is
- /// the number of taps of the filter in the negative direction.
- ///
- ///
- /// The number of taps of the high-pass synthesis filter in the
- /// positive direction
- ///
- ///
- override public int SynHighPosSupport
- {
- get
- {
- return 2;
- }
-
- }
- /// Returns the implementation type of this filter, as defined in this
- /// class, such as WT_FILTER_INT_LIFT, WT_FILTER_FLOAT_LIFT,
- /// WT_FILTER_FLOAT_CONVOL.
- ///
- ///
- /// WT_FILTER_INT_LIFT.
- ///
- ///
- override public int ImplType
- {
- get
- {
- return CSJ2K.j2k.wavelet.WaveletFilter_Fields.WT_FILTER_INT_LIFT;
- }
-
- }
- /// Returns the reversibility of the filter. A filter is considered
- /// reversible if it is suitable for lossless coding.
- ///
- ///
- /// true since the 5x3 is reversible, provided the appropriate
- /// rounding is performed.
- ///
- ///
- override public bool Reversible
- {
- get
- {
- return true;
- }
-
- }
- /// Returns the type of filter used according to the FilterTypes interface
- /// (W5x3).
- ///
- ///
- ///
- ///
- ///
- /// The filter type.
- ///
- ///
- override public int FilterType
- {
- get
- {
- return CSJ2K.j2k.wavelet.FilterTypes_Fields.W5X3;
- }
-
- }
-
- /// The low-pass synthesis filter of the 5x3 wavelet transform
- //UPGRADE_NOTE: Final was removed from the declaration of 'LPSynthesisFilter'. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private static readonly float[] LPSynthesisFilter = new float[] { 0.5f, 1f, 0.5f };
-
- /// The high-pass synthesis filter of the 5x3 wavelet transform
- //UPGRADE_NOTE: Final was removed from the declaration of 'HPSynthesisFilter'. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private static readonly float[] HPSynthesisFilter = new float[] { -0.125f, -0.25f, 0.75f, -0.25f, -0.125f };
-
- /// An implementation of the analyze_lpf() method that works on int data,
- /// for the forward 5x3 wavelet transform using the lifting scheme. See the
- /// general description of the analyze_lpf() method in the AnWTFilter class
- /// for more details.
- ///
- /// The coefficients of the first lifting step are [-1/2 1 -1/2].
- ///
- /// The coefficients of the second lifting step are [1/4 1 1/4].
- ///
- ///
- /// This is the array that contains the input signal.
- ///
- ///
- /// This is the index in inSig of the first sample to filter.
- ///
- ///
- /// This is the number of samples in the input signal to
- /// filter.
- ///
- ///
- /// This is the step, or interleave factor, of the input
- /// signal samples in the inSig array.
- ///
- ///
- /// This is the array where the low-pass output signal is
- /// placed.
- ///
- ///
- /// This is the index in lowSig of the element where to put
- /// the first low-pass output sample.
- ///
- ///
- /// This is the step, or interleave factor, of the low-pass
- /// output samples in the lowSig array.
- ///
- ///
- /// This is the array where the high-pass output signal is
- /// placed.
- ///
- ///
- /// This is the index in highSig of the element where to put
- /// the first high-pass output sample.
- ///
- ///
- /// This is the step, or interleave factor, of the
- /// high-pass output samples in the highSig array.
- ///
- ///
- public override void analyze_lpf(int[] inSig, int inOff, int inLen, int inStep, int[] lowSig, int lowOff, int lowStep, int[] highSig, int highOff, int highStep)
- {
- int i;
- int iStep = 2 * inStep; //Subsampling in inSig
- int ik; //Indexing inSig
- int lk; //Indexing lowSig
- int hk; //Indexing highSig
-
- /* Generate high frequency subband */
-
- //Initialize counters
- ik = inOff + inStep;
- hk = highOff;
-
- //Apply first lifting step to each "inner" sample.
- for (i = 1; i < inLen - 1; i += 2)
- {
- highSig[hk] = inSig[ik] - ((inSig[ik - inStep] + inSig[ik + inStep]) >> 1);
-
- ik += iStep;
- hk += highStep;
- }
-
- //Handle head boundary effect if input signal has even length.
- if (inLen % 2 == 0)
- {
- highSig[hk] = inSig[ik] - ((2 * inSig[ik - inStep]) >> 1);
- }
-
- /* Generate low frequency subband */
-
- //Initialize counters
- ik = inOff;
- lk = lowOff;
- hk = highOff;
-
- if (inLen > 1)
- {
- lowSig[lk] = inSig[ik] + ((highSig[hk] + 1) >> 1);
- }
- else
- {
- lowSig[lk] = inSig[ik];
- }
-
- ik += iStep;
- lk += lowStep;
- hk += highStep;
-
- //Apply lifting step to each "inner" sample.
- for (i = 2; i < inLen - 1; i += 2)
- {
- lowSig[lk] = inSig[ik] + ((highSig[hk - highStep] + highSig[hk] + 2) >> 2);
-
- ik += iStep;
- lk += lowStep;
- hk += highStep;
- }
-
- //Handle head boundary effect if input signal has odd length.
- if (inLen % 2 == 1)
- {
- if (inLen > 2)
- {
- lowSig[lk] = inSig[ik] + ((2 * highSig[hk - highStep] + 2) >> 2);
- }
- }
- }
-
- /// An implementation of the analyze_hpf() method that works on int data,
- /// for the forward 5x3 wavelet transform using the lifting scheme. See the
- /// general description of the analyze_hpf() method in the AnWTFilter class
- /// for more details.
- ///
- /// The coefficients of the first lifting step are [-1/2 1 -1/2].
- ///
- /// The coefficients of the second lifting step are [1/4 1 1/4].
- ///
- ///
- /// This is the array that contains the input signal.
- ///
- ///
- /// This is the index in inSig of the first sample to filter.
- ///
- ///
- /// This is the number of samples in the input signal to
- /// filter.
- ///
- ///
- /// This is the step, or interleave factor, of the input
- /// signal samples in the inSig array.
- ///
- ///
- /// This is the array where the low-pass output signal is
- /// placed.
- ///
- ///
- /// This is the index in lowSig of the element where to put
- /// the first low-pass output sample.
- ///
- ///
- /// This is the step, or interleave factor, of the low-pass
- /// output samples in the lowSig array.
- ///
- ///
- /// This is the array where the high-pass output signal is
- /// placed.
- ///
- ///
- /// This is the index in highSig of the element where to put
- /// the first high-pass output sample.
- ///
- ///
- /// This is the step, or interleave factor, of the
- /// high-pass output samples in the highSig array.
- ///
- ///
- ///
- ///
- ///
- public override void analyze_hpf(int[] inSig, int inOff, int inLen, int inStep, int[] lowSig, int lowOff, int lowStep, int[] highSig, int highOff, int highStep)
- {
- int i;
- int iStep = 2 * inStep; //Subsampling in inSig
- int ik; //Indexing inSig
- int lk; //Indexing lowSig
- int hk; //Indexing highSig
-
- /* Generate high frequency subband */
-
- //Initialize counters
- ik = inOff;
- hk = highOff;
-
- if (inLen > 1)
- {
- // apply a symmetric extension.
- highSig[hk] = inSig[ik] - inSig[ik + inStep];
- }
- else
- {
- // Normalize for Nyquist gain
- highSig[hk] = inSig[ik] << 1;
- }
-
- ik += iStep;
- hk += highStep;
-
- //Apply first lifting step to each "inner" sample.
- if (inLen > 3)
- {
- for (i = 2; i < inLen - 1; i += 2)
- {
- highSig[hk] = inSig[ik] - ((inSig[ik - inStep] + inSig[ik + inStep]) >> 1);
- ik += iStep;
- hk += highStep;
- }
- }
-
- //If input signal has odd length then we perform the lifting step
- //i.e. apply a symmetric extension.
- if (inLen % 2 == 1 && inLen > 1)
- {
- highSig[hk] = inSig[ik] - inSig[ik - inStep];
- }
-
- /* Generate low frequency subband */
-
- //Initialize counters
- ik = inOff + inStep;
- lk = lowOff;
- hk = highOff;
-
- for (i = 1; i < inLen - 1; i += 2)
- {
-
- lowSig[lk] = inSig[ik] + ((highSig[hk] + highSig[hk + highStep] + 2) >> 2);
-
- ik += iStep;
- lk += lowStep;
- hk += highStep;
- }
-
- if (inLen > 1 && inLen % 2 == 0)
- {
- // apply a symmetric extension.
- lowSig[lk] = inSig[ik] + ((2 * highSig[hk] + 2) >> 2);
- }
- }
-
- /// Returns the time-reversed low-pass synthesis waveform of the filter,
- /// which is the low-pass filter. This is the time-reversed impulse
- /// response of the low-pass synthesis filter. It is used to calculate the
- /// L2-norm of the synthesis basis functions for a particular subband (also
- /// called energy weight).
- ///
- /// The returned array may not be modified (i.e. a reference to the
- /// internal array may be returned by the implementation of this
- /// method).
- ///
- ///
- /// The time-reversed low-pass synthesis waveform of the filter.
- ///
- ///
- public override float[] getLPSynthesisFilter()
- {
- return LPSynthesisFilter;
- }
-
- /// Returns the time-reversed high-pass synthesis waveform of the filter,
- /// which is the high-pass filter. This is the time-reversed impulse
- /// response of the high-pass synthesis filter. It is used to calculate the
- /// L2-norm of the synthesis basis functions for a particular subband (also
- /// called energy weight).
- ///
- /// The returned array may not be modified (i.e. a reference to the
- /// internal array may be returned by the implementation of this
- /// method).
- ///
- ///
- /// The time-reversed high-pass synthesis waveform of the filter.
- ///
- ///
- public override float[] getHPSynthesisFilter()
- {
- return HPSynthesisFilter;
- }
-
- /// Returns true if the wavelet filter computes or uses the same "inner"
- /// subband coefficient as the full frame wavelet transform, and false
- /// otherwise. In particular, for block based transforms with reduced
- /// overlap, this method should return false. The term "inner" indicates
- /// that this applies only with respect to the coefficient that are not
- /// affected by image boundaries processings such as symmetric extension,
- /// since there is not reference method for this.
- ///
- /// The result depends on the length of the allowed overlap when
- /// compared to the overlap required by the wavelet filter. It also depends
- /// on how overlap processing is implemented in the wavelet filter.
- ///
- ///
- /// This is the number of samples in the input signal
- /// before the first sample to filter that can be used for overlap.
- ///
- ///
- /// This is the number of samples in the input signal
- /// after the last sample to filter that can be used for overlap.
- ///
- ///
- /// This is the lenght of the input signal to filter.The
- /// required number of samples in the input signal after the last sample
- /// depends on the length of the input signal.
- ///
- ///
- /// true if both overlaps are greater than 2, and correct
- /// processing is applied in the analyze() method.
- ///
- ///
- public override bool isSameAsFullWT(int tailOvrlp, int headOvrlp, int inLen)
- {
-
- //If the input signal has even length.
- if (inLen % 2 == 0)
- {
- if (tailOvrlp >= 2 && headOvrlp >= 1)
- return true;
- else
- return false;
- }
- //Else if the input signal has odd length.
- else
- {
- if (tailOvrlp >= 2 && headOvrlp >= 2)
- return true;
- else
- return false;
- }
- }
-
- /// Tests if the 'obj' object is the same filter as this one. Two filters
- /// are the same if the same filter code should be output for both filters
- /// by the encodeFilterCode() method.
- ///
- /// Currently the implementation of this method only tests if 'obj' is
- /// also of the class AnWTFilterIntLift5x3.
- ///
- ///
- /// object against which to test inequality.
- ///
- ///
- public override bool Equals(System.Object obj)
- {
- // To speed up test, first test for reference equality
- return obj == this || obj is AnWTFilterIntLift5x3;
- }
-
- /// Debugging method
- public override System.String ToString()
- {
- return "w5x3";
- }
- //UPGRADE_NOTE: The following method implementation was automatically added to preserve functionality. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1306'"
- public override int GetHashCode()
- {
- return base.GetHashCode();
- }
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/wavelet/analysis/AnWTFilterSpec.cs b/CSJ2K/j2k/wavelet/analysis/AnWTFilterSpec.cs
deleted file mode 100644
index ecc6ddf7..00000000
--- a/CSJ2K/j2k/wavelet/analysis/AnWTFilterSpec.cs
+++ /dev/null
@@ -1,554 +0,0 @@
-/*
-* CVS identifier:
-*
-* $Id: AnWTFilterSpec.java,v 1.27 2001/05/08 16:11:37 grosbois Exp $
-*
-* Class: AnWTFilterSpec
-*
-* Description: Analysis filters specification
-*
-*
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-* */
-using CSJ2K.j2k.quantization;
-using CSJ2K.j2k.util;
-namespace CSJ2K.j2k.wavelet.analysis
-{
-
- /// This class extends ModuleSpec class for analysis filters specification
- /// holding purpose.
- ///
- ///
- ///
- ///
- ///
- public class AnWTFilterSpec : ModuleSpec
- {
-
- /// The reversible default filter
- private const System.String REV_FILTER_STR = "w5x3";
-
- /// The non-reversible default filter
- private const System.String NON_REV_FILTER_STR = "w9x7";
-
- /// Constructs a new 'AnWTFilterSpec' for the specified number of
- /// components and tiles.
- ///
- ///
- /// The number of tiles
- ///
- ///
- /// The number of components
- ///
- ///
- /// the type of the specification module i.e. tile specific,
- /// component specific or both.
- ///
- ///
- /// Quantization specifications
- ///
- ///
- /// The ParameterList
- ///
- ///
- public AnWTFilterSpec(int nt, int nc, byte type, QuantTypeSpec qts, ParameterList pl) : base(nt, nc, type)
- {
-
- // Check parameters
- pl.checkList(AnWTFilter.OPT_PREFIX, CSJ2K.j2k.util.ParameterList.toNameArray(AnWTFilter.ParameterInfo));
-
- System.String param = pl.getParameter("Ffilters");
- bool isFilterSpecified = true;
-
- // No parameter specified
- if (param == null)
- {
- isFilterSpecified = false;
-
- // If lossless compression, uses the reversible filters in each
- // tile-components
- if (pl.getBooleanParameter("lossless"))
- {
- setDefault(parseFilters(REV_FILTER_STR));
- return;
- }
-
- // If no filter is specified through the command-line, use
- // REV_FILTER_STR or NON_REV_FILTER_STR according to the
- // quantization type
- for (int t = nt - 1; t >= 0; t--)
- {
- for (int c = nc - 1; c >= 0; c--)
- {
- switch (qts.getSpecValType(t, c))
- {
-
- case SPEC_DEF:
- if (getDefault() == null)
- {
- if (pl.getBooleanParameter("lossless"))
- setDefault(parseFilters(REV_FILTER_STR));
- if (((System.String)qts.getDefault()).Equals("reversible"))
- {
- setDefault(parseFilters(REV_FILTER_STR));
- }
- else
- {
- setDefault(parseFilters(NON_REV_FILTER_STR));
- }
- }
- specValType[t][c] = SPEC_DEF;
- break;
-
- case SPEC_COMP_DEF:
- if (!isCompSpecified(c))
- {
- if (((System.String)qts.getCompDef(c)).Equals("reversible"))
- {
- setCompDef(c, parseFilters(REV_FILTER_STR));
- }
- else
- {
- setCompDef(c, parseFilters(NON_REV_FILTER_STR));
- }
- }
- specValType[t][c] = SPEC_COMP_DEF;
- break;
-
- case SPEC_TILE_DEF:
- if (!isTileSpecified(t))
- {
- if (((System.String)qts.getTileDef(t)).Equals("reversible"))
- {
- setTileDef(t, parseFilters(REV_FILTER_STR));
- }
- else
- {
- setTileDef(t, parseFilters(NON_REV_FILTER_STR));
- }
- }
- specValType[t][c] = SPEC_TILE_DEF;
- break;
-
- case SPEC_TILE_COMP:
- if (!isTileCompSpecified(t, c))
- {
- if (((System.String)qts.getTileCompVal(t, c)).Equals("reversible"))
- {
- setTileCompVal(t, c, parseFilters(REV_FILTER_STR));
- }
- else
- {
- setTileCompVal(t, c, parseFilters(NON_REV_FILTER_STR));
- }
- }
- specValType[t][c] = SPEC_TILE_COMP;
- break;
-
- default:
- throw new System.ArgumentException("Unsupported " + "specification " + "type");
-
- }
- }
- }
- return;
- }
-
- // Parse argument
- SupportClass.Tokenizer stk = new SupportClass.Tokenizer(param);
- System.String word; // current word
- byte curSpecType = SPEC_DEF; // Specification type of the
- // current parameter
- bool[] tileSpec = null; // Tiles concerned by the specification
- bool[] compSpec = null; // Components concerned by the specification
- AnWTFilter[][] filter;
-
- while (stk.HasMoreTokens())
- {
- word = stk.NextToken();
-
- switch (word[0])
- {
-
- case 't':
- // Tiles specification
- case 'T': // Tiles specification
- tileSpec = parseIdx(word, nTiles);
- if (curSpecType == SPEC_COMP_DEF)
- curSpecType = SPEC_TILE_COMP;
- else
- curSpecType = SPEC_TILE_DEF;
- break;
-
- case 'c':
- // Components specification
- case 'C': // Components specification
- compSpec = parseIdx(word, nComp);
- if (curSpecType == SPEC_TILE_DEF)
- curSpecType = SPEC_TILE_COMP;
- else
- curSpecType = SPEC_COMP_DEF;
- break;
-
- case 'w':
- // WT filters specification
- case 'W': // WT filters specification
- if (pl.getBooleanParameter("lossless") && word.ToUpper().Equals("w9x7".ToUpper()))
- {
- throw new System.ArgumentException("Cannot use non " + "reversible " + "wavelet transform with" + " '-lossless' option");
- }
-
- filter = parseFilters(word);
- if (curSpecType == SPEC_DEF)
- {
- setDefault(filter);
- }
- else if (curSpecType == SPEC_TILE_DEF)
- {
- for (int i = tileSpec.Length - 1; i >= 0; i--)
- if (tileSpec[i])
- {
- setTileDef(i, filter);
- }
- }
- else if (curSpecType == SPEC_COMP_DEF)
- {
- for (int i = compSpec.Length - 1; i >= 0; i--)
- if (compSpec[i])
- {
- setCompDef(i, filter);
- }
- }
- else
- {
- for (int i = tileSpec.Length - 1; i >= 0; i--)
- {
- for (int j = compSpec.Length - 1; j >= 0; j--)
- {
- if (tileSpec[i] && compSpec[j])
- {
- setTileCompVal(i, j, filter);
- }
- }
- }
- }
-
- // Re-initialize
- curSpecType = SPEC_DEF;
- tileSpec = null;
- compSpec = null;
- break;
-
-
- default:
- throw new System.ArgumentException("Bad construction for " + "parameter: " + word);
-
- }
- }
-
- // Check that default value has been specified
- if (getDefault() == null)
- {
- int ndefspec = 0;
- for (int t = nt - 1; t >= 0; t--)
- {
- for (int c = nc - 1; c >= 0; c--)
- {
- if (specValType[t][c] == SPEC_DEF)
- {
- ndefspec++;
- }
- }
- }
-
- // If some tile-component have received no specification, it takes
- // the default value defined in ParameterList
- if (ndefspec != 0)
- {
- if (((System.String)qts.getDefault()).Equals("reversible"))
- setDefault(parseFilters(REV_FILTER_STR));
- else
- setDefault(parseFilters(NON_REV_FILTER_STR));
- }
- else
- {
- // All tile-component have been specified, takes the first
- // tile-component value as default.
- setDefault(getTileCompVal(0, 0));
- switch (specValType[0][0])
- {
-
- case SPEC_TILE_DEF:
- for (int c = nc - 1; c >= 0; c--)
- {
- if (specValType[0][c] == SPEC_TILE_DEF)
- specValType[0][c] = SPEC_DEF;
- }
- tileDef[0] = null;
- break;
-
- case SPEC_COMP_DEF:
- for (int t = nt - 1; t >= 0; t--)
- {
- if (specValType[t][0] == SPEC_COMP_DEF)
- specValType[t][0] = SPEC_DEF;
- }
- compDef[0] = null;
- break;
-
- case SPEC_TILE_COMP:
- specValType[0][0] = SPEC_DEF;
- tileCompVal["t0c0"] = null;
- break;
- }
- }
- }
-
- // Check consistency between filter and quantization type
- // specification
- for (int t = nt - 1; t >= 0; t--)
- {
- for (int c = nc - 1; c >= 0; c--)
- {
- // Reversible quantization
- if (((System.String)qts.getTileCompVal(t, c)).Equals("reversible"))
- {
- // If filter is reversible, it is OK
- if (isReversible(t, c))
- continue;
-
- // If no filter has been defined, use reversible filter
- if (!isFilterSpecified)
- {
- setTileCompVal(t, c, parseFilters(REV_FILTER_STR));
- }
- else
- {
- // Non reversible filter specified -> Error
- throw new System.ArgumentException("Filter of " + "tile-component" + " (" + t + "," + c + ") does" + " not allow " + "reversible " + "quantization. " + "Specify '-Qtype " + "expounded' or " + "'-Qtype derived'" + "in " + "the command line.");
- }
- }
- else
- {
- // No reversible quantization
- // No reversible filter -> OK
- if (!isReversible(t, c))
- continue;
-
- // If no filter has been specified, use non-reversible
- // filter
- if (!isFilterSpecified)
- {
- setTileCompVal(t, c, parseFilters(NON_REV_FILTER_STR));
- }
- else
- {
- // Reversible filter specified -> Error
- throw new System.ArgumentException("Filter of " + "tile-component" + " (" + t + "," + c + ") does" + " not allow " + "non-reversible " + "quantization. " + "Specify '-Qtype " + "reversible' in " + "the command line");
- }
- }
- }
- }
- }
-
- /// Parse filters from the given word
- ///
- ///
- /// String to parse
- ///
- ///
- /// Analysis wavelet filter (first dimension: by direction,
- /// second dimension: by decomposition levels)
- ///
- private AnWTFilter[][] parseFilters(System.String word)
- {
- AnWTFilter[][] filt = new AnWTFilter[2][];
- for (int i = 0; i < 2; i++)
- {
- filt[i] = new AnWTFilter[1];
- }
- if (word.ToUpper().Equals("w5x3".ToUpper()))
- {
- filt[0][0] = new AnWTFilterIntLift5x3();
- filt[1][0] = new AnWTFilterIntLift5x3();
- return filt;
- }
- else if (word.ToUpper().Equals("w9x7".ToUpper()))
- {
- filt[0][0] = new AnWTFilterFloatLift9x7();
- filt[1][0] = new AnWTFilterFloatLift9x7();
- return filt;
- }
- else
- {
- throw new System.ArgumentException("Non JPEG 2000 part I filter: " + word);
- }
- }
-
- /// Returns the data type used by the filters in this object, as defined in
- /// the 'DataBlk' interface for specified tile-component.
- ///
- ///
- /// Tile index
- ///
- ///
- /// Component index
- ///
- ///
- /// The data type of the filters in this object
- ///
- ///
- ///
- ///
- ///
- public virtual int getWTDataType(int t, int c)
- {
- AnWTFilter[][] an = (AnWTFilter[][])getSpec(t, c);
- return an[0][0].DataType;
- }
-
- /// Returns the horizontal analysis filters to be used in component 'n' and
- /// tile 't'.
- ///
- /// The horizontal analysis filters are returned in an array of
- /// AnWTFilter. Each element contains the horizontal filter for each
- /// resolution level starting with resolution level 1 (i.e. the analysis
- /// filter to go from resolution level 1 to resolution level 0). If there
- /// are less elements than the maximum resolution level, then the last
- /// element is assumed to be repeated.
- ///
- ///
- /// The tile index, in raster scan order
- ///
- ///
- /// The component index.
- ///
- ///
- /// The array of horizontal analysis filters for component 'n' and
- /// tile 't'.
- ///
- ///
- public virtual AnWTFilter[] getHFilters(int t, int c)
- {
- AnWTFilter[][] an = (AnWTFilter[][])getSpec(t, c);
- return an[0];
- }
-
- /// Returns the vertical analysis filters to be used in component 'n' and
- /// tile 't'.
- ///
- /// The vertical analysis filters are returned in an array of
- /// AnWTFilter. Each element contains the vertical filter for each
- /// resolution level starting with resolution level 1 (i.e. the analysis
- /// filter to go from resolution level 1 to resolution level 0). If there
- /// are less elements than the maximum resolution level, then the last
- /// element is assumed to be repeated.
- ///
- ///
- /// The tile index, in raster scan order
- ///
- ///
- /// The component index.
- ///
- ///
- /// The array of horizontal analysis filters for component 'n' and
- /// tile 't'.
- ///
- ///
- public virtual AnWTFilter[] getVFilters(int t, int c)
- {
- AnWTFilter[][] an = (AnWTFilter[][])getSpec(t, c);
- return an[1];
- }
-
- /// Debugging method
- public override System.String ToString()
- {
- System.String str = "";
- AnWTFilter[][] an;
-
- str += ("nTiles=" + nTiles + "\nnComp=" + nComp + "\n\n");
-
- for (int t = 0; t < nTiles; t++)
- {
- for (int c = 0; c < nComp; c++)
- {
- an = (AnWTFilter[][])getSpec(t, c);
-
- str += ("(t:" + t + ",c:" + c + ")\n");
-
- // Horizontal filters
- str += "\tH:";
- for (int i = 0; i < an[0].Length; i++)
- {
- //UPGRADE_TODO: The equivalent in .NET for method 'java.lang.Object.toString' may return a different value. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1043'"
- str += (" " + an[0][i]);
- }
- // Horizontal filters
- str += "\n\tV:";
- for (int i = 0; i < an[1].Length; i++)
- {
- //UPGRADE_TODO: The equivalent in .NET for method 'java.lang.Object.toString' may return a different value. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1043'"
- str += (" " + an[1][i]);
- }
- str += "\n";
- }
- }
-
- return str;
- }
-
- /// Check the reversibility of filters contained is the given
- /// tile-component.
- ///
- ///
- /// The index of the tile
- ///
- ///
- /// The index of the component
- ///
- ///
- public virtual bool isReversible(int t, int c)
- {
- // Note: no need to buffer the result since this method is
- // normally called once per tile-component.
- AnWTFilter[] hfilter = getHFilters(t, c), vfilter = getVFilters(t, c);
-
- // As soon as a filter is not reversible, false can be returned
- for (int i = hfilter.Length - 1; i >= 0; i--)
- if (!hfilter[i].Reversible || !vfilter[i].Reversible)
- return false;
- return true;
- }
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/wavelet/analysis/CBlkWTData.cs b/CSJ2K/j2k/wavelet/analysis/CBlkWTData.cs
deleted file mode 100644
index 3805d4b5..00000000
--- a/CSJ2K/j2k/wavelet/analysis/CBlkWTData.cs
+++ /dev/null
@@ -1,224 +0,0 @@
-/*
-* CVS identifier:
-*
-* $Id: CBlkWTData.java,v 1.18 2001/08/15 17:15:14 grosbois Exp $
-*
-* Class: CBlkWTData
-*
-* Description: Storage for code-blocks of WT data.
-*
-*
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-* */
-using CSJ2K.j2k.image;
-namespace CSJ2K.j2k.wavelet.analysis
-{
-
- /// This is a generic abstract class to store a code-block of wavelet data,
- /// quantized or not. This class does not have the notion of
- /// components. Therefore, it should be used for data from a single
- /// component. Subclasses should implement the different types of storage
- /// (int, float, etc.).
- ///
- /// The data is always stored in one array, of the type matching the data
- /// type (i.e. for 'int' it's an 'int[]'). The data should be stored in the
- /// array in standard scan-line order. That is the samples go from the top-left
- /// corner of the code-block to the lower-right corner by line and then
- /// column.
- ///
- /// The member variable 'offset' gives the index in the array of the first
- /// data element (i.e. the top-left coefficient). The member variable 'scanw'
- /// gives the width of the scan that is used to store the data, that can be
- /// different from the width of the block. Element '(x,y)' of the code-block
- /// (i.e. '(0,0)' is the top-left coefficient), will appear at position
- /// 'offset+y*scanw+x' in the array of data.
- ///
- /// The classes CBlkWTDataInt and CBlkWTDataFloat provide
- /// implementations for int and float types respectively.
- ///
- /// The types of data are the same as those defined by the 'DataBlk'
- /// class.
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public abstract class CBlkWTData
- {
- /// Returns the data type of the CBlkWTData object, as defined in
- /// the DataBlk class.
- ///
- ///
- /// The data type of the object, as defined in the DataBlk class.
- ///
- ///
- ///
- ///
- ///
- public abstract int DataType { get; }
- //UPGRADE_NOTE: Respective javadoc comments were merged. It should be changed in order to comply with .NET documentation conventions. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1199'"
- /// Returns the array containing the data, or null if there is no data. The
- /// returned array is of the type returned by getDataType() (e.g.,
- /// for TYPE_INT, it is a int[]).
- ///
- /// Each implementing class should provide a type specific equivalent
- /// method (e.g., getDataInt() in DataBlkInt) which
- /// returns an array of the correct type explicitely and not through an
- /// Object.
- ///
- ///
- /// The array containing the data, or null if there is no
- /// data.
- ///
- ///
- ///
- ///
- ///
- /// Sets the data array to the specified one. The type of the specified
- /// data array must match the one returned by getDataType() (e.g.,
- /// for TYPE_INT, it should be a int[]). If the wrong
- /// type of array is given a ClassCastException will be thrown.
- ///
- /// The size of the array is not necessarily checked for consistency
- /// with w and h or any other fields.
- ///
- /// Each implementing class should provide a type specific equivalent
- /// method (e.g., setDataInt() in DataBlkInt) which takes
- /// an array of the correct type explicetely and not through an
- /// Object.
- ///
- ///
- /// The new data array to use
- ///
- ///
- ///
- ///
- ///
- public abstract System.Object Data { get; set; }
-
- /// The horizontal coordinate of the upper-left corner of the code-block
- public int ulx;
-
- /// The vertical coordinate of the upper left corner of the code-block
- public int uly;
-
- /// The horizontal index of the code-block, within the subband
- public int n;
-
- /// The vertical index of the code-block, within the subband
- public int m;
-
- /// The subband in which this code-block is found
- public SubbandAn sb;
-
- /// The width of the code-block
- public int w;
-
- /// The height of the code-block
- public int h;
-
- /// The offset in the array of the top-left coefficient
- public int offset;
-
- /// The width of the scanlines used to store the data in the array
- public int scanw;
-
- /// The number of magnitude bits in the integer representation. This is
- /// only used for quantized wavelet data.
- ///
- public int magbits;
-
- /// The WMSE scaling factor (multiplicative) to apply to the distortion
- /// measures of the data of this code-block. By default it is 1.
- ///
- public float wmseScaling = 1f;
-
- /// The value by which the absolute value of the data has to be divided in
- /// order to get the real absolute value. This value is useful to obtain
- /// the complement of 2 representation of a coefficient that is currently
- /// using the sign-magnitude representation.
- ///
- public double convertFactor = 1.0;
-
- /// The quantization step size of the code-block. The value is updated by
- /// the quantizer module
- ///
- public double stepSize = 1.0;
-
- /// Number of ROI coefficients in the code-block
- public int nROIcoeff = 0;
-
- /// Number of ROI magnitude bit-planes
- public int nROIbp = 0;
-
- /// Returns a string of informations about the DataBlk
- ///
- ///
- /// Block dimensions and progressiveness in a string
- ///
- ///
- public override System.String ToString()
- {
- System.String typeString = "";
- switch (DataType)
- {
-
- case DataBlk.TYPE_BYTE:
- typeString = "Unsigned Byte";
- break;
-
- case DataBlk.TYPE_SHORT:
- typeString = "Short";
- break;
-
- case DataBlk.TYPE_INT:
- typeString = "Integer";
- break;
-
- case DataBlk.TYPE_FLOAT:
- typeString = "Float";
- break;
- }
-
- return "ulx=" + ulx + ", uly=" + uly + ", idx=(" + m + "," + n + "), w=" + w + ", h=" + h + ", off=" + offset + ", scanw=" + scanw + ", wmseScaling=" + wmseScaling + ", convertFactor=" + convertFactor + ", stepSize=" + stepSize + ", type=" + typeString + ", magbits=" + magbits + ", nROIcoeff=" + nROIcoeff + ", nROIbp=" + nROIbp;
- }
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/wavelet/analysis/CBlkWTDataFloat.cs b/CSJ2K/j2k/wavelet/analysis/CBlkWTDataFloat.cs
deleted file mode 100644
index 75065a18..00000000
--- a/CSJ2K/j2k/wavelet/analysis/CBlkWTDataFloat.cs
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
-* CVS identifier:
-*
-* $Id: CBlkWTDataFloat.java,v 1.11 2001/08/15 17:18:43 grosbois Exp $
-*
-* Class: CBlkWTDataFloat
-*
-* Description: Implementation of CBlkWTData for 'float' data
-*
-*
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-* */
-using CSJ2K.j2k.image;
-namespace CSJ2K.j2k.wavelet.analysis
-{
-
- /// This is an implementation of the 'CBlkWTData' abstract class for 32 bit
- /// floating point data (float).
- ///
- /// The methods in this class are declared final, so that they can be
- /// inlined by inlining compilers.
- ///
- ///
- ///
- ///
- ///
- public class CBlkWTDataFloat : CBlkWTData
- {
- /// Returns the identifier of this data type, TYPE_FLOAT, as
- /// defined in DataBlk.
- ///
- ///
- /// The type of data stored. Always DataBlk.TYPE_FLOAT
- ///
- ///
- ///
- ///
- ///
- override public int DataType
- {
- get
- {
- return DataBlk.TYPE_FLOAT;
- }
-
- }
- //UPGRADE_NOTE: Respective javadoc comments were merged. It should be changed in order to comply with .NET documentation conventions. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1199'"
- /// Returns the array containing the data, or null if there is no data
- /// array. The returned array is a float array.
- ///
- ///
- /// The array of data (a float[]) or null if there is no data.
- ///
- ///
- /// Sets the data array to the specified one. The provided array must be a
- /// float array, otherwise a ClassCastException is thrown. The size of the
- /// array is not checked for consistency with the code-block dimensions.
- ///
- ///
- /// The data array to use. Must be a float array.
- ///
- ///
- override public System.Object Data
- {
- get
- {
- return data;
- }
-
- set
- {
- data = (float[])value;
- }
-
- }
- //UPGRADE_NOTE: Respective javadoc comments were merged. It should be changed in order to comply with .NET documentation conventions. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1199'"
- /// Returns the array containing the data, or null if there is no data
- /// array.
- ///
- ///
- /// The array of data or null if there is no data.
- ///
- ///
- /// Sets the data array to the specified one. The size of the array is not
- /// checked for consistency with the code-block dimensions. This method is
- /// more efficient than 'setData()'.
- ///
- ///
- /// The data array to use.
- ///
- ///
- virtual public float[] DataFloat
- {
- get
- {
- return data;
- }
-
- set
- {
- data = value;
- }
-
- }
-
- /// The array where the data is stored
- private float[] data;
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/wavelet/analysis/CBlkWTDataInt.cs b/CSJ2K/j2k/wavelet/analysis/CBlkWTDataInt.cs
deleted file mode 100644
index 43fc30db..00000000
--- a/CSJ2K/j2k/wavelet/analysis/CBlkWTDataInt.cs
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
-* CVS identifier:
-*
-* $Id: CBlkWTDataInt.java,v 1.10 2001/08/15 17:18:51 grosbois Exp $
-*
-* Class: CBlkWTDataInt
-*
-* Description: Implementation of CBlkWTData for 'int' data
-*
-*
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-* */
-using CSJ2K.j2k.image;
-namespace CSJ2K.j2k.wavelet.analysis
-{
-
- /// This is an implementation of the 'CBlkWTData' abstract class for signed 32
- /// bit integer data.
- ///
- /// The methods in this class are declared final, so that they can be
- /// inlined by inlining compilers.
- ///
- ///
- ///
- ///
- ///
- public class CBlkWTDataInt : CBlkWTData
- {
- /// Returns the data type of this object, always DataBlk.TYPE_INT.
- ///
- ///
- /// The data type of the object, always DataBlk.TYPE_INT
- ///
- ///
- override public int DataType
- {
- get
- {
- return DataBlk.TYPE_INT;
- }
-
- }
- //UPGRADE_NOTE: Respective javadoc comments were merged. It should be changed in order to comply with .NET documentation conventions. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1199'"
- /// Returns the array containing the data, or null if there is no data
- /// array. The returned array is an int array.
- ///
- ///
- /// The array of data (a int[]) or null if there is no data.
- ///
- ///
- /// Sets the data array to the specified one. The provided array must be a
- /// int array, otherwise a ClassCastException is thrown. The size of the
- /// array is not checked for consistency with the code-block dimensions.
- ///
- ///
- /// The data array to use. Must be an int array.
- ///
- ///
- override public System.Object Data
- {
- get
- {
- return data_array;
- }
-
- set
- {
- data_array = (int[])value;
- }
-
- }
- //UPGRADE_NOTE: Respective javadoc comments were merged. It should be changed in order to comply with .NET documentation conventions. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1199'"
- /// Returns the array containing the data, or null if there is no data
- /// array.
- ///
- ///
- /// The array of data or null if there is no data.
- ///
- ///
- /// Sets the data array to the specified one. The size of the array is not
- /// checked for consistency with the code-block dimensions. This method is
- /// more efficient than 'setData()'.
- ///
- ///
- /// The data array to use.
- ///
- ///
- virtual public int[] DataInt
- {
- get
- {
- return data_array;
- }
-
- set
- {
- data_array = value;
- }
-
- }
-
- /// The array where the data is stored
- public int[] data_array;
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/wavelet/analysis/CBlkWTDataSrc.cs b/CSJ2K/j2k/wavelet/analysis/CBlkWTDataSrc.cs
deleted file mode 100644
index b879f9b6..00000000
--- a/CSJ2K/j2k/wavelet/analysis/CBlkWTDataSrc.cs
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
-* CVS identifier:
-*
-* $Id: CBlkWTDataSrc.java,v 1.18 2001/09/14 08:45:25 grosbois Exp $
-*
-* Class: CBlkWTDataSrc
-*
-* Description: Interface that define methods for transfer of WT
-* data in a code-block basis.
-*
-*
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-* */
-namespace CSJ2K.j2k.wavelet.analysis
-{
-
- /// This abstract class defines methods to transfer wavelet data in a
- /// code-block by code-block basis. In each call to 'getNextCodeBlock()' or
- /// 'getNextInternCodeBlock()' a new code-block is returned. The code-blocks
- /// are returned in no specific order.
- ///
- /// This class is the source of data for the quantizer. See the 'Quantizer'
- /// class.
- ///
- /// Note that no more of one object may request data, otherwise one object
- /// would get some of the data and another one another part, in no defined
- /// manner.
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public interface CBlkWTDataSrc : ForwWTDataProps
- {
-
- /// Returns the position of the fixed point in the specified component, or
- /// equivalently the number of fractional bits. This is the position of the
- /// least significant integral (i.e. non-fractional) bit, which is
- /// equivalent to the number of fractional bits. For instance, for
- /// fixed-point values with 2 fractional bits, 2 is returned. For
- /// floating-point data this value does not apply and 0 should be
- /// returned. Position 0 is the position of the least significant bit in
- /// the data.
- ///
- ///
- /// The index of the component.
- ///
- ///
- /// The position of the fixed-point, which is the same as the
- /// number of fractional bits. For floating-point data 0 is returned.
- ///
- ///
- int getFixedPoint(int c);
-
- /// Return the data type of this CBlkWTDataSrc for the given component in
- /// the current tile. Its value should be either DataBlk.TYPE_INT or
- /// DataBlk.TYPE_FLOAT but can change according to the current
- /// tile-component.
- ///
- ///
- /// Tile index
- ///
- ///
- /// Component index
- ///
- ///
- /// Current data type
- ///
- ///
- int getDataType(int t, int c);
-
- /// Returns the next code-block in the current tile for the specified
- /// component, as a copy (see below). The order in which code-blocks are
- /// returned is not specified. However each code-block is returned only
- /// once and all code-blocks will be returned if the method is called 'N'
- /// times, where 'N' is the number of code-blocks in the tile. After all
- /// the code-blocks have been returned for the current tile calls to this
- /// method will return 'null'.
- ///
- /// When changing the current tile (through 'setTile()' or 'nextTile()')
- /// this method will always return the first code-block, as if this method
- /// was never called before for the new current tile.
- ///
- /// The data returned by this method is always a copy of the internal
- /// data of this object, if any, and it can be modified "in place" without
- /// any problems after being returned. The 'offset' of the returned data is
- /// 0, and the 'scanw' is the same as the code-block width. The 'magbits'
- /// of the returned data is not set by this method and should be
- /// ignored. See the 'CBlkWTData' class.
- ///
- /// The 'ulx' and 'uly' members of the returned 'CBlkWTData' object
- /// contain the coordinates of the top-left corner of the block, with
- /// respect to the tile, not the subband.
- ///
- ///
- /// The component for which to return the next code-block.
- ///
- ///
- /// If non-null this object will be used to return the new
- /// code-block. If null a new one will be allocated and returned. If the
- /// "data" array of the object is non-null it will be reused, if possible,
- /// to return the data.
- ///
- ///
- /// The next code-block in the current tile for component 'c', or
- /// null if all code-blocks for the current tile have been returned.
- ///
- ///
- ///
- ///
- ///
- CBlkWTData getNextCodeBlock(int c, CBlkWTData cblk);
-
- /// Returns the next code-block in the current tile for the specified
- /// component. The order in which code-blocks are returned is not
- /// specified. However each code-block is returned only once and all
- /// code-blocks will be returned if the method is called 'N' times, where
- /// 'N' is the number of code-blocks in the tile. After all the code-blocks
- /// have been returned for the current tile calls to this method will
- /// return 'null'.
- ///
- /// When changing the current tile (through 'setTile()' or 'nextTile()')
- /// this method will always return the first code-block, as if this method
- /// was never called before for the new current tile.
- ///
- /// The data returned by this method can be the data in the internal
- /// buffer of this object, if any, and thus can not be modified by the
- /// caller. The 'offset' and 'scanw' of the returned data can be
- /// arbitrary. The 'magbits' of the returned data is not set by this method
- /// and should be ignored. See the 'CBlkWTData' class.
- ///
- /// The 'ulx' and 'uly' members of the returned 'CBlkWTData' object
- /// contain the coordinates of the top-left corner of the block, with
- /// respect to the tile, not the subband.
- ///
- ///
- /// The component for which to return the next code-block.
- ///
- ///
- /// If non-null this object will be used to return the new
- /// code-block. If null a new one will be allocated and returned. If the
- /// "data" array of the object is non-null it will be reused, if possible,
- /// to return the data.
- ///
- ///
- /// The next code-block in the current tile for component 'n', or
- /// null if all code-blocks for the current tile have been returned.
- ///
- ///
- ///
- ///
- ///
- CBlkWTData getNextInternCodeBlock(int c, CBlkWTData cblk);
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/wavelet/analysis/ForwWT.cs b/CSJ2K/j2k/wavelet/analysis/ForwWT.cs
deleted file mode 100644
index 653c212b..00000000
--- a/CSJ2K/j2k/wavelet/analysis/ForwWT.cs
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
-* CVS identifier:
-*
-* $Id: ForwWT.java,v 1.9 2001/10/24 12:02:13 grosbois Exp $
-*
-* Class: ForwWT
-*
-* Description: The interface for implementations of a forward
-* wavelet transform.
-*
-*
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-* */
-namespace CSJ2K.j2k.wavelet.analysis
-{
-
- /// This interface extends the WaveletTransform with the specifics of forward
- /// wavelet transforms. Classes that implement forward wavelet transfoms should
- /// implement this interface.
- ///
- /// This class does not define the methods to transfer data, just the
- /// specifics to forward wavelet transform. Different data transfer methods are
- /// evisageable for different transforms.
- ///
- ///
- public interface ForwWT : WaveletTransform, ForwWTDataProps
- {
-
- /// Returns the horizontal analysis wavelet filters used in each level, for
- /// the specified tile-component. The first element in the array is the
- /// filter used to obtain the lowest resolution (resolution level 0)
- /// subbands (i.e. lowest frequency LL subband), the second element is the
- /// one used to generate the resolution level 1 subbands, and so on. If
- /// there are less elements in the array than the number of resolution
- /// levels, then the last one is assumed to repeat itself.
- ///
- /// The returned filters are applicable only to the specified component
- /// and in the current tile.
- ///
- /// The resolution level of a subband is the resolution level to which a
- /// subband contributes, which is different from its decomposition
- /// level.
- ///
- ///
- /// The index of the tile for which to return the filters.
- ///
- ///
- /// The index of the component for which to return the filters.
- ///
- ///
- /// The horizontal analysis wavelet filters used in each level.
- ///
- ///
- AnWTFilter[] getHorAnWaveletFilters(int t, int c);
-
- /// Returns the vertical analysis wavelet filters used in each level, for
- /// the specified tile-component. The first element in the array is the
- /// filter used to obtain the lowest resolution (resolution level 0)
- /// subbands (i.e. lowest frequency LL subband), the second element is the
- /// one used to generate the resolution level 1 subbands, and so on. If
- /// there are less elements in the array than the number of resolution
- /// levels, then the last one is assumed to repeat itself.
- ///
- /// The returned filters are applicable only to the specified component
- /// and in the current tile.
- ///
- /// The resolution level of a subband is the resolution level to which a
- /// subband contributes, which is different from its decomposition
- /// level.
- ///
- ///
- /// The index of the tile for which to return the filters.
- ///
- ///
- /// The index of the component for which to return the filters.
- ///
- ///
- /// The vertical analysis wavelet filters used in each level.
- ///
- ///
- AnWTFilter[] getVertAnWaveletFilters(int t, int c);
-
- /// Returns the number of decomposition levels that are applied to obtain
- /// the LL band, in the specified tile-component. A value of 0 means that
- /// no wavelet transform is applied.
- ///
- ///
- /// The tile index
- ///
- ///
- /// The index of the component.
- ///
- ///
- /// The number of decompositions applied to obtain the LL subband
- /// (0 for no wavelet transform).
- ///
- ///
- int getDecompLevels(int t, int c);
-
- /// Returns the wavelet tree decomposition. Only WT_DECOMP_DYADIC is
- /// supported by JPEG 2000 part I.
- ///
- ///
- /// The tile index
- ///
- ///
- /// The index of the component.
- ///
- ///
- /// The wavelet decomposition.
- ///
- ///
- int getDecomp(int t, int c);
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/wavelet/analysis/ForwWTDataProps.cs b/CSJ2K/j2k/wavelet/analysis/ForwWTDataProps.cs
deleted file mode 100644
index 17805998..00000000
--- a/CSJ2K/j2k/wavelet/analysis/ForwWTDataProps.cs
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
-* CVS identifier:
-*
-* $Id: ForwWTDataProps.java,v 1.10 2001/09/20 12:42:42 grosbois Exp $
-*
-* Class: ForwWTDataProps
-*
-* Description: Extends ImgData with forward wavelet specific
-* things.
-*
-*
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-* */
-using CSJ2K.j2k.image;
-namespace CSJ2K.j2k.wavelet.analysis
-{
-
- /// This interface extends the ImgData interface with methods that are
- /// necessary for forward wavelet data (i.e. data that is produced by a forward
- /// wavelet transform).
- ///
- public interface ForwWTDataProps : ImgData
- {
- /// Returns the horizontal offset of the code-block partition. Allowable
- /// values are 0 and 1, nothing else.
- ///
- ///
- int CbULX
- {
- get;
-
- }
- /// Returns the vertical offset of the code-block partition. Allowable
- /// values are 0 and 1, nothing else.
- ///
- ///
- int CbULY
- {
- get;
-
- }
-
- /// Returns the reversibility of the given tile-component. Data is
- /// reversible when it is suitable for lossless and lossy-to-lossless
- /// compression.
- ///
- ///
- /// Tile index
- ///
- ///
- /// Component index
- ///
- ///
- /// true is the data is reversible, false if not.
- ///
- ///
- bool isReversible(int t, int c);
-
- /// Returns a reference to the root of subband tree structure representing
- /// the subband decomposition for the specified tile-component.
- ///
- ///
- /// The index of the tile.
- ///
- ///
- /// The index of the component.
- ///
- ///
- /// The root of the subband tree structure, see Subband.
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- SubbandAn getAnSubbandTree(int t, int c);
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/wavelet/analysis/ForwWTFull.cs b/CSJ2K/j2k/wavelet/analysis/ForwWTFull.cs
deleted file mode 100644
index cd4eeb99..00000000
--- a/CSJ2K/j2k/wavelet/analysis/ForwWTFull.cs
+++ /dev/null
@@ -1,1225 +0,0 @@
-/*
-* CVS identifier:
-*
-* $Id: ForwWTFull.java,v 1.30 2001/09/20 12:42:59 grosbois Exp $
-*
-* Class: ForwWTFull
-*
-* Description: This class implements the full page
-* forward wavelet transform for both integer
-* and floating point implementations.
-*
-*
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-* */
-using CSJ2K.j2k.encoder;
-using CSJ2K.j2k.entropy;
-using CSJ2K.j2k.image;
-using CSJ2K.j2k.util;
-using System;
-namespace CSJ2K.j2k.wavelet.analysis
-{
-
- /// This class implements the ForwardWT abstract class with the full-page
- /// approach to be used either with integer or floating-point filters
- ///
- ///
- ///
- ///
- ///
- public class ForwWTFull : ForwardWT
- {
- /// Returns the horizontal offset of the code-block partition. Allowable
- /// values are 0 and 1, nothing else.
- ///
- ///
- override public int CbULX
- {
- get
- {
- return cb0x;
- }
-
- }
- /// Returns the vertical offset of the code-block partition. Allowable
- /// values are 0 and 1, nothing else.
- ///
- ///
- override public int CbULY
- {
- get
- {
- return cb0y;
- }
-
- }
-
- /// Boolean to know if one are currently dealing with int or float data.
- private bool intData;
-
- /// The subband trees of each tile-component. The array is allocated by the
- /// constructor of this class and updated by the getAnSubbandTree() method
- /// when needed. The first index is the tile index (in lexicographical
- /// order) and the second index is the component index.
- ///
- /// The subband tree for a component in the current tile is created on
- /// the first call to getAnSubbandTree() for that component, in the current
- /// tile. Before that, the element in 'subbTrees' is null.
- ///
- ///
- private SubbandAn[][] subbTrees;
-
- /// The source of image data
- private BlkImgDataSrc src;
-
- /// The horizontal coordinate of the code-block partition origin on the
- /// reference grid
- ///
- private int cb0x;
-
- /// The vertical coordinate of the code-block partition on the reference
- /// grid
- ///
- private int cb0y;
-
- /// The number of decomposition levels specification
- private IntegerSpec dls;
-
- /// Wavelet filters for all components and tiles
- private AnWTFilterSpec filters;
-
- /// The code-block size specifications
- private CBlkSizeSpec cblks;
-
- /// The precinct partition specifications
- private PrecinctSizeSpec pss;
-
- /// Block storing the full band decomposition for each component.
- private DataBlk[] decomposedComps;
-
- /// The horizontal index of the last "sent" code-block in the current
- /// subband in each component. It should be -1 if none have been sent yet.
- ///
- ///
- private int[] lastn;
-
- /// The vertical index of the last "sent" code-block in the current
- /// subband in each component. It should be 0 if none have been sent yet.
- ///
- ///
- private int[] lastm;
-
- /// The subband being dealt with in each component
- internal SubbandAn[] currentSubband;
-
- /// Cache object to avoid excessive allocation/desallocation. This
- /// variable makes the class inheritently thread unsafe.
- ///
- internal Coord ncblks;
-
- /// Initializes this object with the given source of image data and with
- /// all the decompositon parameters
- ///
- ///
- /// From where the image data should be obtained.
- ///
- ///
- /// The encoder specifications
- ///
- ///
- /// The horizontal coordinate of the code-block partition
- /// origin on the reference grid.
- ///
- ///
- /// The vertical coordinate of the code-block partition origin
- /// on the reference grid.
- ///
- ///
- ///
- ///
- ///
- public ForwWTFull(BlkImgDataSrc src, EncoderSpecs encSpec, int cb0x, int cb0y) : base(src)
- {
- this.src = src;
- this.cb0x = cb0x;
- this.cb0y = cb0y;
- this.dls = encSpec.dls;
- this.filters = encSpec.wfs;
- this.cblks = encSpec.cblks;
- this.pss = encSpec.pss;
-
- int ncomp = src.NumComps;
- int ntiles = src.getNumTiles();
-
- currentSubband = new SubbandAn[ncomp];
- decomposedComps = new DataBlk[ncomp];
- subbTrees = new SubbandAn[ntiles][];
- for (int i = 0; i < ntiles; i++)
- {
- subbTrees[i] = new SubbandAn[ncomp];
- }
- lastn = new int[ncomp];
- lastm = new int[ncomp];
- }
-
- /// Returns the implementation type of this wavelet transform, WT_IMPL_FULL
- /// (full-page based transform). All components return the same.
- ///
- ///
- /// The index of the component.
- ///
- ///
- /// WT_IMPL_FULL
- ///
- ///
- public override int getImplementationType(int c)
- {
- return CSJ2K.j2k.wavelet.WaveletTransform_Fields.WT_IMPL_FULL;
- }
-
- /// Returns the number of decomposition levels that are applied to the LL
- /// band, in the specified tile-component. A value of 0 means that no
- /// wavelet transform is applied.
- ///
- ///
- /// The tile index
- ///
- ///
- /// The index of the component.
- ///
- ///
- /// The number of decompositions applied to the LL band (0 for no
- /// wavelet transform).
- ///
- ///
- public override int getDecompLevels(int t, int c)
- {
- return ((System.Int32)dls.getTileCompVal(t, c));
- }
-
- /// Returns the wavelet tree decomposition. Actually JPEG 2000 part 1 only
- /// supports WT_DECOMP_DYADIC decomposition.
- ///
- ///
- /// The tile-index
- ///
- ///
- /// The index of the component.
- ///
- ///
- /// The wavelet decomposition.
- ///
- ///
- public override int getDecomp(int t, int c)
- {
- return WT_DECOMP_DYADIC;
- }
-
- /// Returns the horizontal analysis wavelet filters used in each level, for
- /// the specified component and tile. The first element in the array is the
- /// filter used to obtain the lowest resolution (resolution level 0)
- /// subbands (i.e. lowest frequency LL subband), the second element is the
- /// one used to generate the resolution level 1 subbands, and so on. If
- /// there are less elements in the array than the number of resolution
- /// levels, then the last one is assumed to repeat itself.
- ///
- /// The returned filters are applicable only to the specified component
- /// and in the current tile.
- ///
- /// The resolution level of a subband is the resolution level to which a
- /// subband contributes, which is different from its decomposition
- /// level.
- ///
- ///
- /// The index of the tile for which to return the filters.
- ///
- ///
- /// The index of the component for which to return the filters.
- ///
- ///
- /// The horizontal analysis wavelet filters used in each level.
- ///
- ///
- public override AnWTFilter[] getHorAnWaveletFilters(int t, int c)
- {
- return filters.getHFilters(t, c);
- }
-
- /// Returns the vertical analysis wavelet filters used in each level, for
- /// the specified component and tile. The first element in the array is the
- /// filter used to obtain the lowest resolution (resolution level 0)
- /// subbands (i.e. lowest frequency LL subband), the second element is the
- /// one used to generate the resolution level 1 subbands, and so on. If
- /// there are less elements in the array than the number of resolution
- /// levels, then the last one is assumed to repeat itself.
- ///
- /// The returned filters are applicable only to the specified component
- /// and in the current tile.
- ///
- /// The resolution level of a subband is the resolution level to which a
- /// subband contributes, which is different from its decomposition
- /// level.
- ///
- ///
- /// The index of the tile for which to return the filters.
- ///
- ///
- /// The index of the component for which to return the filters.
- ///
- ///
- /// The vertical analysis wavelet filters used in each level.
- ///
- ///
- public override AnWTFilter[] getVertAnWaveletFilters(int t, int c)
- {
- return filters.getVFilters(t, c);
- }
-
- /// Returns the reversibility of the wavelet transform for the specified
- /// component and tile. A wavelet transform is reversible when it is
- /// suitable for lossless and lossy-to-lossless compression.
- ///
- ///
- /// The index of the tile.
- ///
- ///
- /// The index of the component.
- ///
- ///
- /// true is the wavelet transform is reversible, false if not.
- ///
- ///
- public override bool isReversible(int t, int c)
- {
- return filters.isReversible(t, c);
- }
-
- /// Returns the position of the fixed point in the specified
- /// component. This is the position of the least significant integral
- /// (i.e. non-fractional) bit, which is equivalent to the number of
- /// fractional bits. For instance, for fixed-point values with 2 fractional
- /// bits, 2 is returned. For floating-point data this value does not apply
- /// and 0 should be returned. Position 0 is the position of the least
- /// significant bit in the data.
- ///
- ///
- /// The index of the component.
- ///
- ///
- /// The position of the fixed-point, which is the same as the
- /// number of fractional bits. For floating-point data 0 is returned.
- ///
- ///
- public override int getFixedPoint(int c)
- {
- return src.getFixedPoint(c);
- }
-
- /// Returns the next code-block in the current tile for the specified
- /// component. The order in which code-blocks are returned is not
- /// specified. However each code-block is returned only once and all
- /// code-blocks will be returned if the method is called 'N' times, where
- /// 'N' is the number of code-blocks in the tile. After all the code-blocks
- /// have been returned for the current tile calls to this method will
- /// return 'null'.
- ///
- /// When changing the current tile (through 'setTile()' or 'nextTile()')
- /// this method will always return the first code-block, as if this method
- /// was never called before for the new current tile.
- ///
- /// The data returned by this method is the data in the internal buffer
- /// of this object, and thus can not be modified by the caller. The
- /// 'offset' and 'scanw' of the returned data have, in general, some
- /// non-zero value. The 'magbits' of the returned data is not set by this
- /// method and should be ignored. See the 'CBlkWTData' class.
- ///
- /// The 'ulx' and 'uly' members of the returned 'CBlkWTData' object
- /// contain the coordinates of the top-left corner of the block, with
- /// respect to the tile, not the subband.
- ///
- ///
- /// The component for which to return the next code-block.
- ///
- ///
- /// If non-null this object will be used to return the new
- /// code-block. If null a new one will be allocated and returned.
- ///
- ///
- /// The next code-block in the current tile for component 'n', or
- /// null if all code-blocks for the current tile have been returned.
- ///
- ///
- ///
- ///
- ///
- public override CBlkWTData getNextInternCodeBlock(int c, CBlkWTData cblk)
- {
- int cbm, cbn, cn, cm;
- int acb0x, acb0y;
- SubbandAn sb;
- intData = (filters.getWTDataType(tIdx, c) == DataBlk.TYPE_INT);
-
- //If the source image has not been decomposed
- if (decomposedComps[c] == null)
- {
- int k, w, h;
- DataBlk bufblk;
- System.Object dst_data;
-
- w = getTileCompWidth(tIdx, c);
- h = getTileCompHeight(tIdx, c);
-
- //Get the source image data
- if (intData)
- {
- decomposedComps[c] = new DataBlkInt(0, 0, w, h);
- bufblk = new DataBlkInt();
- }
- else
- {
- decomposedComps[c] = new DataBlkFloat(0, 0, w, h);
- bufblk = new DataBlkFloat();
- }
-
- // Get data from source line by line (this diminishes the memory
- // requirements on the data source)
- dst_data = decomposedComps[c].Data;
- int lstart = getCompULX(c);
- bufblk.ulx = lstart;
- bufblk.w = w;
- bufblk.h = 1;
- int kk = getCompULY(c);
- for (k = 0; k < h; k++, kk++)
- {
- bufblk.uly = kk;
- bufblk.ulx = lstart;
- bufblk = src.getInternCompData(bufblk, c);
- // CONVERSION PROBLEM?
- Array.Copy((System.Array)bufblk.Data, bufblk.offset, (System.Array)dst_data, k * w, w);
- }
-
- //Decompose source image
- waveletTreeDecomposition(decomposedComps[c], getAnSubbandTree(tIdx, c), c);
-
- // Make the first subband the current one
- currentSubband[c] = getNextSubband(c);
-
- lastn[c] = -1;
- lastm[c] = 0;
- }
-
- // Get the next code-block to "send"
- do
- {
- // Calculate number of code-blocks in current subband
- ncblks = currentSubband[c].numCb;
- // Goto next code-block
- lastn[c]++;
- if (lastn[c] == ncblks.x)
- {
- // Got to end of this row of
- // code-blocks
- lastn[c] = 0;
- lastm[c]++;
- }
- if (lastm[c] < ncblks.y)
- {
- // Not past the last code-block in the subband, we can return
- // this code-block
- break;
- }
- // If we get here we already sent all code-blocks in this subband,
- // goto next subband
- currentSubband[c] = getNextSubband(c);
- lastn[c] = -1;
- lastm[c] = 0;
- if (currentSubband[c] == null)
- {
- // We don't need the transformed data any more (a priori)
- decomposedComps[c] = null;
- // All code-blocks from all subbands in the current
- // tile have been returned so we return a null
- // reference
- return null;
- }
- // Loop to find the next code-block
- }
- while (true);
-
-
- // Project code-block partition origin to subband. Since the origin is
- // always 0 or 1, it projects to the low-pass side (throught the ceil
- // operator) as itself (i.e. no change) and to the high-pass side
- // (through the floor operator) as 0, always.
- acb0x = cb0x;
- acb0y = cb0y;
- switch (currentSubband[c].sbandIdx)
- {
-
- case Subband.WT_ORIENT_LL:
- // No need to project since all low-pass => nothing to do
- break;
-
- case Subband.WT_ORIENT_HL:
- acb0x = 0;
- break;
-
- case Subband.WT_ORIENT_LH:
- acb0y = 0;
- break;
-
- case Subband.WT_ORIENT_HH:
- acb0x = 0;
- acb0y = 0;
- break;
-
- default:
- throw new System.ApplicationException("Internal JJ2000 error");
-
- }
-
- // Initialize output code-block
- if (cblk == null)
- {
- if (intData)
- {
- cblk = new CBlkWTDataInt();
- }
- else
- {
- cblk = new CBlkWTDataFloat();
- }
- }
- cbn = lastn[c];
- cbm = lastm[c];
- sb = currentSubband[c];
- cblk.n = cbn;
- cblk.m = cbm;
- cblk.sb = sb;
- // Calculate the indexes of first code-block in subband with respect
- // to the partitioning origin, to then calculate the position and size
- // NOTE: when calculating "floor()" by integer division the dividend
- // and divisor must be positive, we ensure that by adding the divisor
- // to the dividend and then substracting 1 to the result of the
- // division
- cn = (sb.ulcx - acb0x + sb.nomCBlkW) / sb.nomCBlkW - 1;
- cm = (sb.ulcy - acb0y + sb.nomCBlkH) / sb.nomCBlkH - 1;
- if (cbn == 0)
- {
- // Left-most code-block, starts where subband starts
- cblk.ulx = sb.ulx;
- }
- else
- {
- // Calculate starting canvas coordinate and convert to subb. coords
- cblk.ulx = (cn + cbn) * sb.nomCBlkW - (sb.ulcx - acb0x) + sb.ulx;
- }
- if (cbm == 0)
- {
- // Bottom-most code-block, starts where subband starts
- cblk.uly = sb.uly;
- }
- else
- {
- cblk.uly = (cm + cbm) * sb.nomCBlkH - (sb.ulcy - acb0y) + sb.uly;
- }
- if (cbn < ncblks.x - 1)
- {
- // Calculate where next code-block starts => width
- cblk.w = (cn + cbn + 1) * sb.nomCBlkW - (sb.ulcx - acb0x) + sb.ulx - cblk.ulx;
- }
- else
- {
- // Right-most code-block, ends where subband ends
- cblk.w = sb.ulx + sb.w - cblk.ulx;
- }
- if (cbm < ncblks.y - 1)
- {
- // Calculate where next code-block starts => height
- cblk.h = (cm + cbm + 1) * sb.nomCBlkH - (sb.ulcy - acb0y) + sb.uly - cblk.uly;
- }
- else
- {
- // Bottom-most code-block, ends where subband ends
- cblk.h = sb.uly + sb.h - cblk.uly;
- }
- cblk.wmseScaling = 1f;
-
- // Since we are in getNextInternCodeBlock() we can return a
- // reference to the internal buffer, no need to copy. Just initialize
- // the 'offset' and 'scanw'
- cblk.offset = cblk.uly * decomposedComps[c].w + cblk.ulx;
- cblk.scanw = decomposedComps[c].w;
-
- // For the data just put a reference to our buffer
- cblk.Data = decomposedComps[c].Data;
- // Return code-block
- return cblk;
- }
-
- /// Returns the next code-block in the current tile for the specified
- /// component, as a copy (see below). The order in which code-blocks are
- /// returned is not specified. However each code-block is returned only
- /// once and all code-blocks will be returned if the method is called 'N'
- /// times, where 'N' is the number of code-blocks in the tile. After all
- /// the code-blocks have been returned for the current tile calls to this
- /// method will return 'null'.
- ///
- /// When changing the current tile (through 'setTile()' or 'nextTile()')
- /// this method will always return the first code-block, as if this method
- /// was never called before for the new current tile.
- ///
- /// The data returned by this method is always a copy of the internal
- /// data of this object, and it can be modified "in place" without
- /// any problems after being returned. The 'offset' of the returned data is
- /// 0, and the 'scanw' is the same as the code-block width. The 'magbits'
- /// of the returned data is not set by this method and should be
- /// ignored. See the 'CBlkWTData' class.
- ///
- /// The 'ulx' and 'uly' members of the returned 'CBlkWTData' object
- /// contain the coordinates of the top-left corner of the block, with
- /// respect to the tile, not the subband.
- ///
- ///
- /// The component for which to return the next code-block.
- ///
- ///
- /// If non-null this object will be used to return the new
- /// code-block. If null a new one will be allocated and returned. If the
- /// "data" array of the object is non-null it will be reused, if possible,
- /// to return the data.
- ///
- ///
- /// The next code-block in the current tile for component 'c', or
- /// null if all code-blocks for the current tile have been returned.
- ///
- ///
- ///
- ///
- ///
- public override CBlkWTData getNextCodeBlock(int c, CBlkWTData cblk)
- {
- // We can not directly use getNextInternCodeBlock() since that returns
- // a reference to the internal buffer, we have to copy that data
-
- int j, k;
- int w;
- System.Object dst_data; // a int[] or float[] object
- int[] dst_data_int;
- float[] dst_data_float;
- System.Object src_data; // a int[] or float[] object
-
- intData = (filters.getWTDataType(tIdx, c) == DataBlk.TYPE_INT);
-
- dst_data = null;
-
- // Cache the data array, if any
- if (cblk != null)
- {
- dst_data = cblk.Data;
- }
-
- // Get the next code-block
- cblk = getNextInternCodeBlock(c, cblk);
-
- if (cblk == null)
- {
- return null; // No more code-blocks in current tile for component
- // c
- }
-
- // Ensure size of output buffer
- if (intData)
- {
- // int data
- dst_data_int = (int[])dst_data;
- if (dst_data_int == null || dst_data_int.Length < cblk.w * cblk.h)
- {
- dst_data = new int[cblk.w * cblk.h];
- }
- }
- else
- {
- // float data
- dst_data_float = (float[])dst_data;
- if (dst_data_float == null || dst_data_float.Length < cblk.w * cblk.h)
- {
- dst_data = new float[cblk.w * cblk.h];
- }
- }
-
- // Copy data line by line
- src_data = cblk.Data;
- w = cblk.w;
- for (j = w * (cblk.h - 1), k = cblk.offset + (cblk.h - 1) * cblk.scanw; j >= 0; j -= w, k -= cblk.scanw)
- {
- // CONVERSION PROBLEM?
- Array.Copy((System.Array)src_data, k, (System.Array)dst_data, j, w);
- }
- cblk.Data = dst_data;
- cblk.offset = 0;
- cblk.scanw = w;
-
- return cblk;
- }
-
- /// Return the data type of this CBlkWTDataSrc. Its value should be either
- /// DataBlk.TYPE_INT or DataBlk.TYPE_FLOAT but can change according to the
- /// current tile-component.
- ///
- ///
- /// The index of the tile for which to return the data type.
- ///
- ///
- /// The index of the component for which to return the data type.
- ///
- ///
- /// Current data type
- ///
- ///
- public override int getDataType(int t, int c)
- {
- return filters.getWTDataType(t, c);
- }
-
- /// Returns the next subband that will be used to get the next code-block
- /// to return by the getNext[Intern]CodeBlock method.
- ///
- ///
- /// The component
- ///
- ///
- /// Its returns the next subband that will be used to get the next
- /// code-block to return by the getNext[Intern]CodeBlock method.
- ///
- ///
- private SubbandAn getNextSubband(int c)
- {
- int down = 1;
- int up = 0;
- int direction = down;
- SubbandAn nextsb;
-
- nextsb = currentSubband[c];
- //If it is the first call to this method
- if (nextsb == null)
- {
- nextsb = getAnSubbandTree(tIdx, c);
- //If there is no decomposition level then send the whole image
- if (!nextsb.isNode)
- {
- return nextsb;
- }
- }
-
- //Find the next subband to send
- do
- {
- //If the current subband is null then break
- if (nextsb == null)
- {
- break;
- }
- //If the current subband is a leaf then select the next leaf to
- //send or go up in the decomposition tree if the leaf was a LL
- //one.
- else if (!nextsb.isNode)
- {
- switch (nextsb.orientation)
- {
-
- case Subband.WT_ORIENT_HH:
- nextsb = (SubbandAn)nextsb.Parent.LH;
- direction = down;
- break;
-
- case Subband.WT_ORIENT_LH:
- nextsb = (SubbandAn)nextsb.Parent.HL;
- direction = down;
- break;
-
- case Subband.WT_ORIENT_HL:
- nextsb = (SubbandAn)nextsb.Parent.LL;
- direction = down;
- break;
-
- case Subband.WT_ORIENT_LL:
- nextsb = (SubbandAn)nextsb.Parent;
- direction = up;
- break;
- }
- }
- //Else if the current subband is a node
- else if (nextsb.isNode)
- {
- //If the direction is down the select the HH subband of the
- //current node.
- if (direction == down)
- {
- nextsb = (SubbandAn)nextsb.HH;
- }
- //Else the direction is up the select the next node to cover
- //or still go up in the decomposition tree if the node is a LL
- //subband
- else if (direction == up)
- {
- switch (nextsb.orientation)
- {
-
- case Subband.WT_ORIENT_HH:
- nextsb = (SubbandAn)nextsb.Parent.LH;
- direction = down;
- break;
-
- case Subband.WT_ORIENT_LH:
- nextsb = (SubbandAn)nextsb.Parent.HL;
- direction = down;
- break;
-
- case Subband.WT_ORIENT_HL:
- nextsb = (SubbandAn)nextsb.Parent.LL;
- direction = down;
- break;
-
- case Subband.WT_ORIENT_LL:
- nextsb = (SubbandAn)nextsb.Parent;
- direction = up;
- break;
- }
- }
- }
-
- if (nextsb == null)
- {
- break;
- }
- }
- while (nextsb.isNode);
- return nextsb;
- }
-
- /// Performs the forward wavelet transform on the whole band. It
- /// iteratively decomposes the subbands from the top node to the leaves.
- ///
- ///
- /// The band containing the float data to decompose
- ///
- ///
- /// The structure containing the coordinates of the current
- /// subband in the whole band to decompose.
- ///
- ///
- /// The index of the current component to decompose
- ///
- ///
- private void waveletTreeDecomposition(DataBlk band, SubbandAn subband, int c)
- {
-
- //If the current subband is a leaf then nothing to be done (a leaf is
- //not decomposed).
- if (!subband.isNode)
- {
- return;
- }
- else
- {
- //Perform the 2D wavelet decomposition of the current subband
- wavelet2DDecomposition(band, (SubbandAn)subband, c);
-
- //Perform the decomposition of the four resulting subbands
- waveletTreeDecomposition(band, (SubbandAn)subband.HH, c);
- waveletTreeDecomposition(band, (SubbandAn)subband.LH, c);
- waveletTreeDecomposition(band, (SubbandAn)subband.HL, c);
- waveletTreeDecomposition(band, (SubbandAn)subband.LL, c);
- }
- }
-
- /// Performs the 2D forward wavelet transform on a subband of the initial
- /// band. This method will successively perform 1D filtering steps on all
- /// lines and then all columns of the subband. In this class only filters
- /// with floating point implementations can be used.
- ///
- ///
- /// The band containing the float data to decompose
- ///
- ///
- /// The structure containing the coordinates of the subband
- /// in the whole band to decompose.
- ///
- ///
- /// The index of the current component to decompose
- ///
- ///
- private void wavelet2DDecomposition(DataBlk band, SubbandAn subband, int c)
- {
-
- int ulx, uly, w, h;
- int band_w, band_h;
-
- // If subband is empty (i.e. zero size) nothing to do
- if (subband.w == 0 || subband.h == 0)
- {
- return;
- }
-
- ulx = subband.ulx;
- uly = subband.uly;
- w = subband.w;
- h = subband.h;
- band_w = getTileCompWidth(tIdx, c);
- band_h = getTileCompHeight(tIdx, c);
-
- if (intData)
- {
- //Perform the decompositions if the filter is implemented with an
- //integer arithmetic.
- int i, j;
- int offset;
- int[] tmpVector = new int[System.Math.Max(w, h)];
- int[] data = ((DataBlkInt)band).DataInt;
-
- //Perform the vertical decomposition
- if (subband.ulcy % 2 == 0)
- {
- // Even start index => use LPF
- for (j = 0; j < w; j++)
- {
- offset = uly * band_w + ulx + j;
- for (i = 0; i < h; i++)
- tmpVector[i] = data[offset + (i * band_w)];
- subband.vFilter.analyze_lpf(tmpVector, 0, h, 1, data, offset, band_w, data, offset + ((h + 1) / 2) * band_w, band_w);
- }
- }
- else
- {
- // Odd start index => use HPF
- for (j = 0; j < w; j++)
- {
- offset = uly * band_w + ulx + j;
- for (i = 0; i < h; i++)
- tmpVector[i] = data[offset + (i * band_w)];
- subband.vFilter.analyze_hpf(tmpVector, 0, h, 1, data, offset, band_w, data, offset + (h / 2) * band_w, band_w);
- }
- }
-
- //Perform the horizontal decomposition.
- if (subband.ulcx % 2 == 0)
- {
- // Even start index => use LPF
- for (i = 0; i < h; i++)
- {
- offset = (uly + i) * band_w + ulx;
- for (j = 0; j < w; j++)
- tmpVector[j] = data[offset + j];
- subband.hFilter.analyze_lpf(tmpVector, 0, w, 1, data, offset, 1, data, offset + (w + 1) / 2, 1);
- }
- }
- else
- {
- // Odd start index => use HPF
- for (i = 0; i < h; i++)
- {
- offset = (uly + i) * band_w + ulx;
- for (j = 0; j < w; j++)
- tmpVector[j] = data[offset + j];
- subband.hFilter.analyze_hpf(tmpVector, 0, w, 1, data, offset, 1, data, offset + w / 2, 1);
- }
- }
- }
- else
- {
- //Perform the decompositions if the filter is implemented with a
- //float arithmetic.
- int i, j;
- int offset;
- float[] tmpVector = new float[System.Math.Max(w, h)];
- float[] data = ((DataBlkFloat)band).DataFloat;
-
- //Perform the vertical decomposition.
- if (subband.ulcy % 2 == 0)
- {
- // Even start index => use LPF
- for (j = 0; j < w; j++)
- {
- offset = uly * band_w + ulx + j;
- for (i = 0; i < h; i++)
- tmpVector[i] = data[offset + (i * band_w)];
- subband.vFilter.analyze_lpf(tmpVector, 0, h, 1, data, offset, band_w, data, offset + ((h + 1) / 2) * band_w, band_w);
- }
- }
- else
- {
- // Odd start index => use HPF
- for (j = 0; j < w; j++)
- {
- offset = uly * band_w + ulx + j;
- for (i = 0; i < h; i++)
- tmpVector[i] = data[offset + (i * band_w)];
- subband.vFilter.analyze_hpf(tmpVector, 0, h, 1, data, offset, band_w, data, offset + (h / 2) * band_w, band_w);
- }
- }
- //Perform the horizontal decomposition.
- if (subband.ulcx % 2 == 0)
- {
- // Even start index => use LPF
- for (i = 0; i < h; i++)
- {
- offset = (uly + i) * band_w + ulx;
- for (j = 0; j < w; j++)
- tmpVector[j] = data[offset + j];
- subband.hFilter.analyze_lpf(tmpVector, 0, w, 1, data, offset, 1, data, offset + (w + 1) / 2, 1);
- }
- }
- else
- {
- // Odd start index => use HPF
- for (i = 0; i < h; i++)
- {
- offset = (uly + i) * band_w + ulx;
- for (j = 0; j < w; j++)
- tmpVector[j] = data[offset + j];
- subband.hFilter.analyze_hpf(tmpVector, 0, w, 1, data, offset, 1, data, offset + w / 2, 1);
- }
- }
- }
- }
-
- /// Changes the current tile, given the new coordinates.
- ///
- /// This method resets the 'subbTrees' array, and recalculates the
- /// values of the 'reversible' array. It also resets the decomposed
- /// component buffers.
- ///
- ///
- /// The horizontal coordinate of the tile.
- ///
- ///
- /// The vertical coordinate of the new tile.
- ///
- ///
- public override void setTile(int x, int y)
- {
- int i;
-
- // Change tile
- base.setTile(x, y);
-
- // Reset the decomposed component buffers.
- if (decomposedComps != null)
- {
- for (i = decomposedComps.Length - 1; i >= 0; i--)
- {
- decomposedComps[i] = null;
- currentSubband[i] = null;
- }
- }
- }
-
- /// Advances to the next tile, in standard scan-line order (by rows then
- /// columns). An NoNextElementException is thrown if the current tile is
- /// the last one (i.e. there is no next tile).
- ///
- /// This method resets the 'subbTrees' array, and recalculates the
- /// values of the 'reversible' array. It also resets the decomposed
- /// component buffers.
- ///
- ///
- public override void nextTile()
- {
- int i;
-
- // Change tile
- base.nextTile();
- // Reset the decomposed component buffers
- if (decomposedComps != null)
- {
- for (i = decomposedComps.Length - 1; i >= 0; i--)
- {
- decomposedComps[i] = null;
- currentSubband[i] = null;
- }
- }
- }
-
- /// Returns a reference to the subband tree structure representing the
- /// subband decomposition for the specified tile-component of the source.
- ///
- ///
- /// The index of the tile.
- ///
- ///
- /// The index of the component.
- ///
- ///
- /// The subband tree structure, see Subband.
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public override SubbandAn getAnSubbandTree(int t, int c)
- {
- if (subbTrees[t][c] == null)
- {
- subbTrees[t][c] = new SubbandAn(getTileCompWidth(t, c), getTileCompHeight(t, c), getCompULX(c), getCompULY(c), getDecompLevels(t, c), getHorAnWaveletFilters(t, c), getVertAnWaveletFilters(t, c));
- initSubbandsFields(t, c, subbTrees[t][c]);
- }
- return subbTrees[t][c];
- }
-
- /// Initialises subbands fields, such as number of code-blocks and
- /// code-blocks dimension, in the subband tree. The nominal code-block
- /// width/height depends on the precincts dimensions if used.
- ///
- ///
- /// The tile index of the subband
- ///
- ///
- /// The component index
- ///
- ///
- /// The subband tree to be initialised.
- ///
- ///
- private void initSubbandsFields(int t, int c, Subband sb)
- {
- int cbw = cblks.getCBlkWidth(ModuleSpec.SPEC_TILE_COMP, t, c);
- int cbh = cblks.getCBlkHeight(ModuleSpec.SPEC_TILE_COMP, t, c);
-
- if (!sb.isNode)
- {
- // Code-blocks dimension
- int ppx, ppy;
- int ppxExp, ppyExp, cbwExp, cbhExp;
- ppx = pss.getPPX(t, c, sb.resLvl);
- ppy = pss.getPPY(t, c, sb.resLvl);
-
- if (ppx != CSJ2K.j2k.codestream.Markers.PRECINCT_PARTITION_DEF_SIZE || ppy != CSJ2K.j2k.codestream.Markers.PRECINCT_PARTITION_DEF_SIZE)
- {
-
- ppxExp = MathUtil.log2(ppx);
- ppyExp = MathUtil.log2(ppy);
- cbwExp = MathUtil.log2(cbw);
- cbhExp = MathUtil.log2(cbh);
-
- // Precinct partition is used
- switch (sb.resLvl)
- {
-
- case 0:
- sb.nomCBlkW = (cbwExp < ppxExp ? (1 << cbwExp) : (1 << ppxExp));
- sb.nomCBlkH = (cbhExp < ppyExp ? (1 << cbhExp) : (1 << ppyExp));
- break;
-
-
- default:
- sb.nomCBlkW = (cbwExp < ppxExp - 1 ? (1 << cbwExp) : (1 << (ppxExp - 1)));
- sb.nomCBlkH = (cbhExp < ppyExp - 1 ? (1 << cbhExp) : (1 << (ppyExp - 1)));
- break;
-
- }
- }
- else
- {
- sb.nomCBlkW = cbw;
- sb.nomCBlkH = cbh;
- }
-
- // Number of code-blocks
- if (sb.numCb == null)
- sb.numCb = new Coord();
- if (sb.w != 0 && sb.h != 0)
- {
- int acb0x = cb0x;
- int acb0y = cb0y;
- int tmp;
-
- // Project code-block partition origin to subband. Since the
- // origin is always 0 or 1, it projects to the low-pass side
- // (throught the ceil operator) as itself (i.e. no change) and
- // to the high-pass side (through the floor operator) as 0,
- // always.
- switch (sb.sbandIdx)
- {
-
- case Subband.WT_ORIENT_LL:
- // No need to project since all low-pass => nothing to do
- break;
-
- case Subband.WT_ORIENT_HL:
- acb0x = 0;
- break;
-
- case Subband.WT_ORIENT_LH:
- acb0y = 0;
- break;
-
- case Subband.WT_ORIENT_HH:
- acb0x = 0;
- acb0y = 0;
- break;
-
- default:
- throw new System.ApplicationException("Internal JJ2000 error");
-
- }
- if (sb.ulcx - acb0x < 0 || sb.ulcy - acb0y < 0)
- {
- throw new System.ArgumentException("Invalid code-blocks " + "partition origin or " + "image offset in the " + "reference grid.");
- }
- // NOTE: when calculating "floor()" by integer division the
- // dividend and divisor must be positive, we ensure that by
- // adding the divisor to the dividend and then substracting 1
- // to the result of the division
- tmp = sb.ulcx - acb0x + sb.nomCBlkW;
- sb.numCb.x = (tmp + sb.w - 1) / sb.nomCBlkW - (tmp / sb.nomCBlkW - 1);
- tmp = sb.ulcy - acb0y + sb.nomCBlkH;
- sb.numCb.y = (tmp + sb.h - 1) / sb.nomCBlkH - (tmp / sb.nomCBlkH - 1);
- }
- else
- {
- sb.numCb.x = sb.numCb.y = 0;
- }
- }
- else
- {
- initSubbandsFields(t, c, sb.LL);
- initSubbandsFields(t, c, sb.HL);
- initSubbandsFields(t, c, sb.LH);
- initSubbandsFields(t, c, sb.HH);
- }
- }
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/wavelet/analysis/ForwardWT.cs b/CSJ2K/j2k/wavelet/analysis/ForwardWT.cs
deleted file mode 100644
index 21a23794..00000000
--- a/CSJ2K/j2k/wavelet/analysis/ForwardWT.cs
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
-* CVS identifier:
-*
-* $Id: ForwardWT.java,v 1.60 2001/09/14 09:54:53 grosbois Exp $
-*
-* Class: ForwardWT
-*
-* Description: This interface defines the specifics
-* of forward wavelet transforms
-*
-*
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-* */
-using CSJ2K.j2k.encoder;
-using CSJ2K.j2k.image;
-using CSJ2K.j2k.util;
-namespace CSJ2K.j2k.wavelet.analysis
-{
-
- /// This abstract class represents the forward wavelet transform functional
- /// block. The functional block may actually be comprised of several classes
- /// linked together, but a subclass of this abstract class is the one that is
- /// returned as the functional block that performs the forward wavelet
- /// transform.
- ///
- /// This class assumes that data is transferred in code-blocks, as defined
- /// by the 'CBlkWTDataSrc' interface. The internal calculation of the wavelet
- /// transform may be done differently but a buffering class should convert to
- /// that type of transfer.
- ///
- ///
- public abstract class ForwardWT : ImgDataAdapter, ForwWT, CBlkWTDataSrc
- {
- /// Returns the parameters that are used in this class and implementing
- /// classes. It returns a 2D String array. Each of the 1D arrays is for a
- /// different option, and they have 3 elements. The first element is the
- /// option name, the second one is the synopsis and the third one is a long
- /// description of what the parameter is. The synopsis or description may
- /// be 'null', in which case it is assumed that there is no synopsis or
- /// description of the option, respectively. Null may be returned if no
- /// options are supported.
- ///
- ///
- /// the options name, their synopsis and their explanation, or null
- /// if no options are supported.
- ///
- ///
- public static System.String[][] ParameterInfo
- {
- get
- {
- return pinfo;
- }
-
- }
- public abstract int CbULY { get; }
- public abstract int CbULX { get; }
-
- /// ID for the dyadic wavelet tree decomposition (also called "Mallat" in
- /// JPEG 2000): 0x00.
- ///
- ///
- public const int WT_DECOMP_DYADIC = 0;
-
- /// The prefix for wavelet transform options: 'W'
- public const char OPT_PREFIX = 'W';
-
- /// The list of parameters that is accepted for wavelet transform. Options
- /// for the wavelet transform start with 'W'.
- ///
- //UPGRADE_NOTE: Final was removed from the declaration of 'pinfo'. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private static readonly System.String[][] pinfo = new System.String[][] { new System.String[] { "Wlev", "", "Specifies the number of wavelet decomposition levels to apply to " + "the image. If 0 no wavelet transform is performed. All components " + "and all tiles have the same number of decomposition levels.", "5" }, new System.String[] { "Wwt", "[full]", "Specifies the wavelet transform to be used. Possible value is: " + "'full' (full page). The value 'full' performs a normal DWT.", "full" }, new System.String[] { "Wcboff", "", "Code-blocks partition offset in the reference grid. Allowed for " + " and are 0 and 1.\n" + "Note: This option is defined in JPEG 2000 part 2 and may not" + " be supported by all JPEG 2000 decoders.", "0 0" } };
-
- /// Initializes this object for the specified number of tiles 'nt' and
- /// components 'nc'.
- ///
- ///
- /// The source of ImgData
- ///
- ///
- protected internal ForwardWT(ImgData src) : base(src)
- {
- }
-
- /// Creates a ForwardWT object with the specified filters, and with other
- /// options specified in the parameter list 'pl'.
- ///
- ///
- /// The source of data to be transformed
- ///
- ///
- /// The parameter list (or options).
- ///
- ///
- /// The encoder specifications.
- ///
- ///
- /// A new ForwardWT object with the specified filters and options
- /// from 'pl'.
- ///
- ///
- /// If mandatory parameters are missing
- /// or if invalid values are given.
- ///
- ///
- public static ForwardWT createInstance(BlkImgDataSrc src, ParameterList pl, EncoderSpecs encSpec)
- {
- int deflev; // defdec removed
- //System.String decompstr;
- //System.String wtstr;
- //System.String pstr;
- //SupportClass.StreamTokenizerSupport stok;
- //SupportClass.Tokenizer strtok;
- //int prefx, prefy; // Partitioning reference point coordinates
-
- // Check parameters
- pl.checkList(OPT_PREFIX, CSJ2K.j2k.util.ParameterList.toNameArray(pinfo));
-
- deflev = ((System.Int32)encSpec.dls.getDefault());
-
- // Code-block partition origin
- System.String str = "";
- if (pl.getParameter("Wcboff") == null)
- {
- throw new System.ApplicationException("You must specify an argument to the '-Wcboff' " + "option. See usage with the '-u' option");
- }
- SupportClass.Tokenizer stk = new SupportClass.Tokenizer(pl.getParameter("Wcboff"));
- if (stk.Count != 2)
- {
- throw new System.ArgumentException("'-Wcboff' option needs two" + " arguments. See usage with " + "the '-u' option.");
- }
- int cb0x = 0;
- str = stk.NextToken();
- try
- {
- cb0x = (System.Int32.Parse(str));
- }
- catch (System.FormatException)
- {
- throw new System.ArgumentException("Bad first parameter for the " + "'-Wcboff' option: " + str);
- }
- if (cb0x < 0 || cb0x > 1)
- {
- throw new System.ArgumentException("Invalid horizontal " + "code-block partition origin.");
- }
- int cb0y = 0;
- str = stk.NextToken();
- try
- {
- cb0y = (System.Int32.Parse(str));
- }
- catch (System.FormatException)
- {
- throw new System.ArgumentException("Bad second parameter for the " + "'-Wcboff' option: " + str);
- }
- if (cb0y < 0 || cb0y > 1)
- {
- throw new System.ArgumentException("Invalid vertical " + "code-block partition origin.");
- }
- if (cb0x != 0 || cb0y != 0)
- {
- FacilityManager.getMsgLogger().printmsg(CSJ2K.j2k.util.MsgLogger_Fields.WARNING, "Code-blocks partition origin is " + "different from (0,0). This is defined in JPEG 2000" + " part 2 and may be not supported by all JPEG 2000 " + "decoders.");
- }
-
- return new ForwWTFull(src, encSpec, cb0x, cb0y);
- }
- public abstract bool isReversible(int param1, int param2);
- public abstract CSJ2K.j2k.wavelet.analysis.CBlkWTData getNextInternCodeBlock(int param1, CSJ2K.j2k.wavelet.analysis.CBlkWTData param2);
- public abstract int getFixedPoint(int param1);
- public abstract CSJ2K.j2k.wavelet.analysis.AnWTFilter[] getHorAnWaveletFilters(int param1, int param2);
- public abstract CSJ2K.j2k.wavelet.analysis.AnWTFilter[] getVertAnWaveletFilters(int param1, int param2);
- public abstract CSJ2K.j2k.wavelet.analysis.SubbandAn getAnSubbandTree(int param1, int param2);
- public abstract int getDecompLevels(int param1, int param2);
- public abstract CSJ2K.j2k.wavelet.analysis.CBlkWTData getNextCodeBlock(int param1, CSJ2K.j2k.wavelet.analysis.CBlkWTData param2);
- public abstract int getImplementationType(int param1);
- public abstract int getDataType(int param1, int param2);
- public abstract int getDecomp(int param1, int param2);
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/wavelet/analysis/SubbandAn.cs b/CSJ2K/j2k/wavelet/analysis/SubbandAn.cs
deleted file mode 100644
index c0a9a6c6..00000000
--- a/CSJ2K/j2k/wavelet/analysis/SubbandAn.cs
+++ /dev/null
@@ -1,513 +0,0 @@
-/*
-* CVS identifier:
-*
-* $Id: SubbandAn.java,v 1.30 2001/08/02 09:13:53 grosbois Exp $
-*
-* Class: SubbandAn
-*
-* Description: Element for a tree structure for a descripotion
-* of subbands on the anslysis side.
-*
-*
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-* */
-namespace CSJ2K.j2k.wavelet.analysis
-{
-
- /// This class represents a subband in a bidirectional tree structure that
- /// describes the subband decomposition for a wavelet transform, specifically
- /// for the analysis side.
- ///
- /// The element can be either a node or a leaf of the tree. If it is a node
- /// then ther are 4 descendants (LL, HL, LH and HH). If it is a leaf there are
- /// no descendants.
- ///
- /// The tree is bidirectional. Each element in the tree structure has a
- /// "parent", which is the subband from which the element was obtained by
- /// decomposition. The only exception is the root element which has no parent
- /// (i.e.it's null), for obvious reasons.
- ///
- ///
- public class SubbandAn : Subband
- {
- /// Returns the parent of this subband. The parent of a subband is the
- /// subband from which this one was obtained by decomposition. The root
- /// element has no parent subband (null).
- ///
- ///
- /// The parent subband, or null for the root one.
- ///
- ///
- override public Subband Parent
- {
- get
- {
- return parentband;
- }
-
- }
- /// Returns the LL child subband of this subband.
- ///
- ///
- /// The LL child subband, or null if there are no childs.
- ///
- ///
- override public Subband LL
- {
- get
- {
- return subb_LL;
- }
-
- }
- /// Returns the HL (horizontal high-pass) child subband of this subband.
- ///
- ///
- /// The HL child subband, or null if there are no childs.
- ///
- ///
- override public Subband HL
- {
- get
- {
- return subb_HL;
- }
-
- }
- /// Returns the LH (vertical high-pass) child subband of this subband.
- ///
- ///
- /// The LH child subband, or null if there are no childs.
- ///
- ///
- override public Subband LH
- {
- get
- {
- return subb_LH;
- }
-
- }
- /// Returns the HH child subband of this subband.
- ///
- ///
- /// The HH child subband, or null if there are no childs.
- ///
- ///
- override public Subband HH
- {
- get
- {
- return subb_HH;
- }
-
- }
- /// This function returns the horizontal wavelet filter relevant to this
- /// subband
- ///
- ///
- /// The horizontal wavelet filter
- ///
- ///
- override public WaveletFilter HorWFilter
- {
- get
- {
- return hFilter;
- }
-
- }
- /// This function returns the vertical wavelet filter relevant to this
- /// subband
- ///
- ///
- /// The vertical wavelet filter
- ///
- ///
- override public WaveletFilter VerWFilter
- {
- get
- {
- return hFilter;
- }
-
- }
-
- /// The reference to the parent of this subband. It is null for the root
- /// element. It is null by default.
- ///
- public SubbandAn parentband = null;
-
- /// The reference to the LL subband resulting from the decomposition of
- /// this subband. It is null by default.
- ///
- public SubbandAn subb_LL;
-
- /// The reference to the HL subband (horizontal high-pass) resulting from
- /// the decomposition of this subband. It is null by default.
- ///
- public SubbandAn subb_HL;
-
- /// The reference to the LH subband (vertical high-pass) resulting from
- /// the decomposition of this subband. It is null by default.
- ///
- ///
- public SubbandAn subb_LH;
-
- /// The reference to the HH subband resulting from the decomposition of
- /// this subband. It is null by default.
- ///
- public SubbandAn subb_HH;
-
- /// The horizontal analysis filter used to decompose this subband. This is
- /// applicable to "node" elements only. The default value is null.
- ///
- public AnWTFilter hFilter;
-
- /// The vertical analysis filter used to decompose this subband. This is
- /// applicable to "node" elements only. The default value is null.
- ///
- public AnWTFilter vFilter;
-
- /// The L2-norm of the synthesis basis waveform of this subband,
- /// applicable to "leafs" only. By default it is -1 (i.e. not calculated
- /// yet).
- ///
- ///
- public float l2Norm = -1.0f;
-
- /// The contribution to the MSE or WMSE error that would result in the
- /// image if there was an error of exactly one quantization step size in
- /// the sample of the subband. This value is expressed relative to a
- /// nominal dynamic range in the image domain of exactly 1.0. This field
- /// contains valid data only after quantization 9See Quantizer).
- ///
- ///
- ///
- ///
- ///
- public float stepWMSE;
-
- /// Creates a SubbandAn element with all the default values. The dimensions
- /// are (0,0) and the upper left corner is (0,0).
- ///
- ///
- public SubbandAn()
- {
- }
-
- /// Creates the top-level node and the entire subband tree, with the
- /// top-level dimensions, the number of decompositions, and the
- /// decomposition tree as specified.
- ///
- /// This constructor just calls the same constructor of the super class,
- /// and then calculates the L2-norm (or energy weight) of each leaf.
- ///
- /// This constructor does not initialize the value of the magBits or
- /// stepWMSE member variables. This variables are normally initialized by
- /// the quantizer (see Quantizer).
- ///
- ///
- /// The top-level width
- ///
- ///
- /// The top-level height
- ///
- ///
- /// The horizontal coordinate of the upper-left corner with
- /// respect to the canvas origin, in the component grid.
- ///
- ///
- /// The vertical coordinate of the upper-left corner with
- /// respect to the canvas origin, in the component grid.
- ///
- ///
- /// The number of levels (or LL decompositions) in the tree.
- ///
- ///
- /// The horizontal wavelet analysis filters for each
- /// resolution level, starting at resolution level 0.
- ///
- ///
- /// The vertical wavelet analysis filters for each
- /// resolution level, starting at resolution level 0.
- ///
- ///
- ///
- /// WaveletFilter[],WaveletFilter[])
- ///
- ///
- ///
- ///
- ///
- public SubbandAn(int w, int h, int ulcx, int ulcy, int lvls, WaveletFilter[] hfilters, WaveletFilter[] vfilters) : base(w, h, ulcx, ulcy, lvls, hfilters, vfilters)
- {
- // Caculate the L2-norms
- calcL2Norms();
- }
-
- /// Splits the current subband in its four subbands. It changes the status
- /// of this element (from a leaf to a node, and sets the filters), creates
- /// the childs and initializes them. An IllegalArgumentException is thrown
- /// if this subband is not a leaf.
- ///
- /// It uses the initChilds() method to initialize the childs.
- ///
- ///
- /// The horizontal wavelet filter used to decompose this
- /// subband. It has to be a AnWTFilter object.
- ///
- ///
- /// The vertical wavelet filter used to decompose this
- /// subband. It has to be a AnWTFilter object.
- ///
- ///
- /// A reference to the LL leaf (subb_LL).
- ///
- ///
- ///
- ///
- ///
- protected internal override Subband split(WaveletFilter hfilter, WaveletFilter vfilter)
- {
- // Test that this is a node
- if (isNode)
- {
- throw new System.ArgumentException();
- }
-
- // Modify this element into a node and set the filters
- isNode = true;
- this.hFilter = (AnWTFilter)hfilter;
- this.vFilter = (AnWTFilter)vfilter;
-
- // Create childs
- subb_LL = new SubbandAn();
- subb_LH = new SubbandAn();
- subb_HL = new SubbandAn();
- subb_HH = new SubbandAn();
-
- // Assign parent
- subb_LL.parentband = this;
- subb_HL.parentband = this;
- subb_LH.parentband = this;
- subb_HH.parentband = this;
-
- // Initialize childs
- initChilds();
-
- // Return reference to LL subband
- return subb_LL;
- }
-
- /// Calculates the basis waveform of the first leaf for which the L2-norm
- /// has not been calculated yet. This method searches recursively for the
- /// first leaf for which the value has not been calculated yet, and then
- /// calculates the L2-norm on the return path.
- ///
- /// The wfs argument should be a size 2 array of float arrays (i.e. 2D
- /// array) and it must be of length 2 (or more). When returning, wfs[0]
- /// will contain the line waveform, and wfs[1] will contain the column
- /// waveform.
- ///
- /// This method can not be called on an element that ahs a non-negative
- /// value in l2Norm, since that means that we are done.
- ///
- ///
- /// An size 2 array where the line and column waveforms will be
- /// returned.
- ///
- ///
- private void calcBasisWaveForms(float[][] wfs)
- {
- if (l2Norm < 0)
- {
- // We are not finished with this element yet
- if (isNode)
- {
- // We are on a node => search on childs
- if (subb_LL.l2Norm < 0f)
- {
- subb_LL.calcBasisWaveForms(wfs);
- wfs[0] = hFilter.getLPSynWaveForm(wfs[0], null);
- wfs[1] = vFilter.getLPSynWaveForm(wfs[1], null);
- }
- else if (subb_HL.l2Norm < 0f)
- {
- subb_HL.calcBasisWaveForms(wfs);
- wfs[0] = hFilter.getHPSynWaveForm(wfs[0], null);
- wfs[1] = vFilter.getLPSynWaveForm(wfs[1], null);
- }
- else if (subb_LH.l2Norm < 0f)
- {
- subb_LH.calcBasisWaveForms(wfs);
- wfs[0] = hFilter.getLPSynWaveForm(wfs[0], null);
- wfs[1] = vFilter.getHPSynWaveForm(wfs[1], null);
- }
- else if (subb_HH.l2Norm < 0f)
- {
- subb_HH.calcBasisWaveForms(wfs);
- wfs[0] = hFilter.getHPSynWaveForm(wfs[0], null);
- wfs[1] = vFilter.getHPSynWaveForm(wfs[1], null);
- }
- else
- {
- // There is an error! If all childs have non-negative
- // l2norm, then this node should have non-negative l2norm
- throw new System.ApplicationException("You have found a bug in JJ2000!");
- }
- }
- else
- {
- // This is a leaf, just use diracs (null is equivalent to
- // dirac)
- wfs[0] = new float[1];
- wfs[0][0] = 1.0f;
- wfs[1] = new float[1];
- wfs[1][0] = 1.0f;
- }
- }
- else
- {
- // This is an error! The calcBasisWaveForms() method is never
- // called on an element with non-negative l2norm
- throw new System.ApplicationException("You have found a bug in JJ2000!");
- }
- }
-
- /// Assigns the given L2-norm to the first leaf that does not have an
- /// L2-norm value yet (i.e. l2norm is negative). The search is done
- /// recursively and in the same order as that of the calcBasisWaveForms()
- /// method, so that this method is used to assigne the l2norm of the
- /// previously computed waveforms.
- ///
- /// This method can not be called on an element that ahs a non-negative
- /// value in l2Norm, since that means that we are done.
- ///
- ///
- /// The L2-norm to assign.
- ///
- ///
- private void assignL2Norm(float l2n)
- {
- if (l2Norm < 0)
- {
- // We are not finished with this element yet
- if (isNode)
- {
- // We are on a node => search on childs
- if (subb_LL.l2Norm < 0f)
- {
- subb_LL.assignL2Norm(l2n);
- }
- else if (subb_HL.l2Norm < 0f)
- {
- subb_HL.assignL2Norm(l2n);
- }
- else if (subb_LH.l2Norm < 0f)
- {
- subb_LH.assignL2Norm(l2n);
- }
- else if (subb_HH.l2Norm < 0f)
- {
- subb_HH.assignL2Norm(l2n);
- // If child now is done, we are done
- if (subb_HH.l2Norm >= 0f)
- {
- l2Norm = 0f; // We are on a node, any non-neg value OK
- }
- }
- else
- {
- // There is an error! If all childs have non-negative
- // l2norm, then this node should have non-negative l2norm
- throw new System.ApplicationException("You have found a bug in JJ2000!");
- }
- }
- else
- {
- // This is a leaf, assign the L2-norm
- l2Norm = l2n;
- }
- }
- else
- {
- // This is an error! The assignL2Norm() method is never called on
- // an element with non-negative l2norm
- throw new System.ApplicationException("You have found a bug in JJ2000!");
- }
- }
-
-
- /// Calculates the L2-norm of the sythesis waveforms of every leaf in the
- /// tree. This method should only be called on the root element.
- ///
- ///
- private void calcL2Norms()
- {
- int i;
- float[][] wfs = new float[2][];
- double acc;
- float l2n;
-
- // While we are not done on the root element, compute basis functions
- // and assign L2-norm
- while (l2Norm < 0f)
- {
- calcBasisWaveForms(wfs);
- // Compute line L2-norm, which is the product of the line
- // and column L2-norms
- acc = 0.0;
- for (i = wfs[0].Length - 1; i >= 0; i--)
- {
- acc += wfs[0][i] * wfs[0][i];
- }
- //UPGRADE_WARNING: Data types in Visual C# might be different. Verify the accuracy of narrowing conversions. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1042'"
- l2n = (float)System.Math.Sqrt(acc);
- // Compute column L2-norm
- acc = 0.0;
- for (i = wfs[1].Length - 1; i >= 0; i--)
- {
- acc += wfs[1][i] * wfs[1][i];
- }
- //UPGRADE_WARNING: Data types in Visual C# might be different. Verify the accuracy of narrowing conversions. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1042'"
- l2n *= (float)System.Math.Sqrt(acc);
- // Release waveforms
- wfs[0] = null;
- wfs[1] = null;
- // Assign the value
- assignL2Norm(l2n);
- }
- }
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/wavelet/synthesis/CBlkWTDataSrcDec.cs b/CSJ2K/j2k/wavelet/synthesis/CBlkWTDataSrcDec.cs
deleted file mode 100644
index 5aec3e4c..00000000
--- a/CSJ2K/j2k/wavelet/synthesis/CBlkWTDataSrcDec.cs
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
-* CVS identifier:
-*
-* $Id: CBlkWTDataSrcDec.java,v 1.19 2001/09/20 12:46:31 grosbois Exp $
-*
-* Class: CBlkWTDataSrcDec
-*
-* Description: Interface that define methods for trasnfer of WT
-* data in a code-block basis (decoder side).
-*
-*
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-* */
-using CSJ2K.j2k.image;
-namespace CSJ2K.j2k.wavelet.synthesis
-{
-
- /// This abstract class defines methods to transfer wavelet data in a
- /// code-block by code-block basis, for the decoder side. In each call to
- /// 'getCodeBlock()' or 'getInternCodeBlock()' a new code-block is
- /// returned. The code-blocks are returned in no specific order.
- ///
- /// This class is the source of data, in general, for the inverse wavelet
- /// transforms. See the 'InverseWT' class.
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public interface CBlkWTDataSrcDec : InvWTData
- {
-
- /// Returns the number of bits, referred to as the "range bits",
- /// corresponding to the nominal range of the data in the specified
- /// component.
- ///
- /// The returned value corresponds to the nominal dynamic range of the
- /// reconstructed image data, not of the wavelet coefficients
- /// themselves. This is because different subbands have different gains and
- /// thus different nominal ranges. To have an idea of the nominal range in
- /// each subband the subband analysis gain value from the subband tree
- /// structure, returned by the 'getSynSubbandTree()' method, can be
- /// used. See the 'Subband' class for more details.
- ///
- /// If this number is b then for unsigned data the nominal range
- /// is between 0 and 2^b-1, and for signed data it is between -2^(b-1) and
- /// 2^(b-1)-1.
- ///
- ///
- /// The index of the component.
- ///
- ///
- /// The number of bits corresponding to the nominal range of the
- /// data.
- ///
- ///
- ///
- ///
- ///
- int getNomRangeBits(int c);
-
- /// Returns the position of the fixed point in the specified component, or
- /// equivalently the number of fractional bits. This is the position of the
- /// least significant integral (i.e. non-fractional) bit, which is
- /// equivalent to the number of fractional bits. For instance, for
- /// fixed-point values with 2 fractional bits, 2 is returned. For
- /// floating-point data this value does not apply and 0 should be
- /// returned. Position 0 is the position of the least significant bit in
- /// the data.
- ///
- ///
- /// The index of the component.
- ///
- ///
- /// The position of the fixed-point, which is the same as the
- /// number of fractional bits. For floating-point data 0 is returned.
- ///
- ///
- int getFixedPoint(int c);
-
- /// Returns the specified code-block in the current tile for the specified
- /// component, as a copy (see below).
- ///
- /// The returned code-block may be progressive, which is indicated by
- /// the 'progressive' variable of the returned 'DataBlk' object. If a
- /// code-block is progressive it means that in a later request to this
- /// method for the same code-block it is possible to retrieve data which is
- /// a better approximation, since meanwhile more data to decode for the
- /// code-block could have been received. If the code-block is not
- /// progressive then later calls to this method for the same code-block
- /// will return the exact same data values.
- ///
- /// The data returned by this method is always a copy of the internal
- /// data of this object, if any, and it can be modified "in place" without
- /// any problems after being returned. The 'offset' of the returned data is
- /// 0, and the 'scanw' is the same as the code-block width. See the
- /// 'DataBlk' class.
- ///
- ///
- /// The component for which to return the next code-block.
- ///
- ///
- /// The vertical index of the code-block to return,
- /// in the specified subband.
- ///
- ///
- /// The horizontal index of the code-block to return,
- /// in the specified subband.
- ///
- ///
- /// The subband in which the code-block to return is.
- ///
- ///
- /// If non-null this object will be used to return the new
- /// code-block. If null a new one will be allocated and returned. If the
- /// "data" array of the object is non-null it will be reused, if possible,
- /// to return the data.
- ///
- ///
- /// The next code-block in the current tile for component 'n', or
- /// null if all code-blocks for the current tile have been returned.
- ///
- ///
- ///
- ///
- ///
- DataBlk getCodeBlock(int c, int m, int n, SubbandSyn sb, DataBlk cblk);
-
- /// Returns the specified code-block in the current tile for the specified
- /// component (as a reference or copy).
- ///
- /// The returned code-block may be progressive, which is indicated by
- /// the 'progressive' variable of the returned 'DataBlk' object. If a
- /// code-block is progressive it means that in a later request to this
- /// method for the same code-block it is possible to retrieve data which is
- /// a better approximation, since meanwhile more data to decode for the
- /// code-block could have been received. If the code-block is not
- /// progressive then later calls to this method for the same code-block
- /// will return the exact same data values.
- ///
- /// The data returned by this method can be the data in the internal
- /// buffer of this object, if any, and thus can not be modified by the
- /// caller. The 'offset' and 'scanw' of the returned data can be
- /// arbitrary. See the 'DataBlk' class.
- ///
- ///
- /// The component for which to return the next code-block.
- ///
- ///
- /// The vertical index of the code-block to return, in the
- /// specified subband.
- ///
- ///
- /// The horizontal index of the code-block to return, in the
- /// specified subband.
- ///
- ///
- /// The subband in which the code-block to return is.
- ///
- ///
- /// If non-null this object will be used to return the new
- /// code-block. If null a new one will be allocated and returned. If the
- /// "data" array of the object is non-null it will be reused, if possible,
- /// to return the data.
- ///
- ///
- /// The next code-block in the current tile for component 'n', or
- /// null if all code-blocks for the current tile have been returned.
- ///
- ///
- ///
- ///
- ///
- DataBlk getInternCodeBlock(int c, int m, int n, SubbandSyn sb, DataBlk cblk);
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/wavelet/synthesis/InvWT.cs b/CSJ2K/j2k/wavelet/synthesis/InvWT.cs
deleted file mode 100644
index c4de4ec1..00000000
--- a/CSJ2K/j2k/wavelet/synthesis/InvWT.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
-* CVS identifier:
-*
-* $Id:
-*
-* Class: InvWT
-*
-* Description: The interface for implementations of a inverse
-* wavelet transform.
-*
-*
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-* */
-namespace CSJ2K.j2k.wavelet.synthesis
-{
-
- /// This interface extends the WaveletTransform with the specifics of inverse
- /// wavelet transforms. Classes that implement inverse wavelet transfoms should
- /// implement this interface.
- ///
- /// This class does not define the methods to transfer data, just the
- /// specifics to inverse wavelet transform. Different data transfer methods are
- /// envisageable for different transforms.
- ///
- ///
- public interface InvWT : WaveletTransform
- {
- /// Sets the image reconstruction resolution level. A value of 0 means
- /// reconstruction of an image with the lowest resolution (dimension)
- /// available.
- ///
- /// Note: Image resolution level indexes may differ from tile-component
- /// resolution index. They are indeed indexed starting from the lowest
- /// number of decomposition levels of each component of each tile.
- ///
- /// Example: For an image (1 tile) with 2 components (component 0 having
- /// 2 decomposition levels and component 1 having 3 decomposition levels),
- /// the first (tile-) component has 3 resolution levels and the second one
- /// has 4 resolution levels, whereas the image has only 3 resolution levels
- /// available.
- ///
- ///
- /// The image resolution level.
- ///
- ///
- /// The vertical coordinate of the image origin in the canvas
- /// system, on the reference grid.
- ///
- ///
- int ImgResLevel
- {
- set;
-
- }
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/wavelet/synthesis/InvWTAdapter.cs b/CSJ2K/j2k/wavelet/synthesis/InvWTAdapter.cs
deleted file mode 100644
index f3713e7f..00000000
--- a/CSJ2K/j2k/wavelet/synthesis/InvWTAdapter.cs
+++ /dev/null
@@ -1,592 +0,0 @@
-/*
-* CVS identifier:
-*
-* $Id: InvWTAdapter.java,v 1.14 2002/07/25 15:11:03 grosbois Exp $
-*
-* Class: InvWTAdapter
-*
-* Description:
-*
-*
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-* */
-using CSJ2K.j2k.decoder;
-using CSJ2K.j2k.image;
-namespace CSJ2K.j2k.wavelet.synthesis
-{
-
- /// This class provides default implementation of the methods in the 'InvWT'
- /// interface. The source is always a 'MultiResImgData', which is a
- /// multi-resolution image. The default implementation is just to return the
- /// value of the source at the current image resolution level, which is set by
- /// the 'setImgResLevel()' method.
- ///
- /// This abstract class can be used to facilitate the development of other
- /// classes that implement the 'InvWT' interface, because most of the trivial
- /// methods are already implemented.
- ///
- /// If the default implementation of a method provided in this class does
- /// not suit a particular implementation of the 'InvWT' interface, the method
- /// can be overriden to implement the proper behaviour.
- ///
- /// If the 'setImgResLevel()' method is overriden then it is very important
- /// that the one of this class is called from the overriding method, so that
- /// the other methods in this class return the correct values.
- ///
- ///
- ///
- ///
- ///
- public abstract class InvWTAdapter : InvWT
- {
- /// Sets the image reconstruction resolution level. A value of 0 means
- /// reconstruction of an image with the lowest resolution (dimension)
- /// available.
- ///
- /// Note: Image resolution level indexes may differ from tile-component
- /// resolution index. They are indeed indexed starting from the lowest
- /// number of decomposition levels of each component of each tile.
- ///
- /// Example: For an image (1 tile) with 2 components (component 0 having
- /// 2 decomposition levels and component 1 having 3 decomposition levels),
- /// the first (tile-) component has 3 resolution levels and the second one
- /// has 4 resolution levels, whereas the image has only 3 resolution levels
- /// available.
- ///
- ///
- /// The image resolution level.
- ///
- ///
- /// The vertical coordinate of the image origin in the canvas
- /// system, on the reference grid.
- ///
- ///
- virtual public int ImgResLevel
- {
- set
- {
- if (value < 0)
- {
- throw new System.ArgumentException("Resolution level index " + "cannot be negative.");
- }
- reslvl = value;
- }
-
- }
- /// Returns the overall width of the current tile in pixels. This is the
- /// tile's width without accounting for any component subsampling. This is
- /// also referred as the reference grid width in the current tile.
- ///
- /// This default implementation returns the value of the source at the
- /// current reconstruction resolution level.
- ///
- ///
- /// The total current tile's width in pixels.
- ///
- ///
- virtual public int TileWidth
- {
- get
- {
- // Retrieves the tile maximum resolution level index and request the
- // width from the source module.
- int tIdx = TileIdx;
- int rl = 10000;
- int mrl;
- int nc = mressrc.NumComps;
- for (int c = 0; c < nc; c++)
- {
- mrl = mressrc.getSynSubbandTree(tIdx, c).resLvl;
- if (mrl < rl)
- rl = mrl;
- }
- return mressrc.getTileWidth(rl);
- }
-
- }
- /// Returns the overall height of the current tile in pixels. This
- /// is the tile's height without accounting for any component
- /// subsampling. This is also referred as the reference grid height
- /// in the current tile.
- ///
- /// This default implementation returns the value of the source at the
- /// current reconstruction resolution level.
- ///
- ///
- /// The total current tile's height in pixels.
- ///
- ///
- virtual public int TileHeight
- {
- get
- {
- // Retrieves the tile maximum resolution level index and request the
- // height from the source module.
- int tIdx = TileIdx;
- int rl = 10000;
- int mrl;
- int nc = mressrc.NumComps;
- for (int c = 0; c < nc; c++)
- {
- mrl = mressrc.getSynSubbandTree(tIdx, c).resLvl;
- if (mrl < rl)
- rl = mrl;
- }
- return mressrc.getTileHeight(rl);
- }
-
- }
- /// Returns the nominal width of tiles
- virtual public int NomTileWidth
- {
- get
- {
- return mressrc.NomTileWidth;
- }
-
- }
- /// Returns the nominal height of tiles
- virtual public int NomTileHeight
- {
- get
- {
- return mressrc.NomTileHeight;
- }
-
- }
- /// Returns the overall width of the image in pixels. This is the
- /// image's width without accounting for any component subsampling
- /// or tiling.
- ///
- ///
- /// The total image's width in pixels.
- ///
- ///
- virtual public int ImgWidth
- {
- get
- {
- return mressrc.getImgWidth(reslvl);
- }
-
- }
- /// Returns the overall height of the image in pixels. This is the
- /// image's height without accounting for any component subsampling
- /// or tiling.
- ///
- ///
- /// The total image's height in pixels.
- ///
- ///
- virtual public int ImgHeight
- {
- get
- {
- return mressrc.getImgHeight(reslvl);
- }
-
- }
- /// Returns the number of components in the image.
- ///
- ///
- /// The number of components in the image.
- ///
- ///
- virtual public int NumComps
- {
- get
- {
- return mressrc.NumComps;
- }
-
- }
- /// Returns the index of the current tile, relative to a standard scan-line
- /// order.
- ///
- /// This default implementation returns the value of the source.
- ///
- ///
- /// The current tile's index (starts at 0).
- ///
- ///
- virtual public int TileIdx
- {
- get
- {
- return mressrc.TileIdx;
- }
-
- }
- /// Returns the horizontal coordinate of the image origin, the top-left
- /// corner, in the canvas system, on the reference grid.
- ///
- /// This default implementation returns the value of the source at the
- /// current reconstruction resolution level.
- ///
- ///
- /// The horizontal coordinate of the image origin in the canvas
- /// system, on the reference grid.
- ///
- ///
- virtual public int ImgULX
- {
- get
- {
- return mressrc.getImgULX(reslvl);
- }
-
- }
- /// Returns the vertical coordinate of the image origin, the top-left
- /// corner, in the canvas system, on the reference grid.
- ///
- /// This default implementation returns the value of the source at the
- /// current reconstruction resolution level.
- ///
- ///
- /// The vertical coordinate of the image origin in the canvas
- /// system, on the reference grid.
- ///
- ///
- virtual public int ImgULY
- {
- get
- {
- return mressrc.getImgULY(reslvl);
- }
-
- }
- /// Returns the horizontal tile partition offset in the reference grid
- virtual public int TilePartULX
- {
- get
- {
- return mressrc.TilePartULX;
- }
-
- }
- /// Returns the vertical tile partition offset in the reference grid
- virtual public int TilePartULY
- {
- get
- {
- return mressrc.TilePartULY;
- }
-
- }
-
- /// The decoder specifications
- protected internal DecoderSpecs decSpec;
-
- /// The 'MultiResImgData' source
- protected internal MultiResImgData mressrc;
-
- /// The resquested image resolution level for reconstruction.
- protected internal int reslvl;
-
- /// The maximum available image resolution level
- protected internal int maxImgRes;
-
- /// Instantiates the 'InvWTAdapter' object using the specified
- /// 'MultiResImgData' source. The reconstruction resolution level is set to
- /// full resolution (i.e. the maximum resolution level).
- ///
- ///
- /// From where to obtain the values to return
- ///
- ///
- /// The decoder specifications
- ///
- ///
- protected internal InvWTAdapter(MultiResImgData src, DecoderSpecs decSpec)
- {
- mressrc = src;
- this.decSpec = decSpec;
- maxImgRes = decSpec.dls.Min;
- }
-
- /// Returns the component subsampling factor in the horizontal
- /// direction, for the specified component. This is, approximately,
- /// the ratio of dimensions between the reference grid and the
- /// component itself, see the 'ImgData' interface desription for
- /// details.
- ///
- ///
- /// The index of the component (between 0 and N-1).
- ///
- ///
- /// The horizontal subsampling factor of component 'c'.
- ///
- ///
- ///
- ///
- ///
- public virtual int getCompSubsX(int c)
- {
- return mressrc.getCompSubsX(c);
- }
-
- /// Returns the component subsampling factor in the vertical
- /// direction, for the specified component. This is, approximately,
- /// the ratio of dimensions between the reference grid and the
- /// component itself, see the 'ImgData' interface desription for
- /// details.
- ///
- ///
- /// The index of the component (between 0 and N-1).
- ///
- ///
- /// The vertical subsampling factor of component 'c'.
- ///
- ///
- ///
- ///
- ///
- public virtual int getCompSubsY(int c)
- {
- return mressrc.getCompSubsY(c);
- }
-
- /// Returns the width in pixels of the specified tile-component
- ///
- ///
- /// Tile index
- ///
- ///
- /// The index of the component, from 0 to N-1.
- ///
- ///
- /// The width in pixels of component n in tile t.
- ///
- ///
- public virtual int getTileCompWidth(int t, int c)
- {
- // Retrieves the tile-component maximum resolution index and gets the
- // width from the source.
- int rl = mressrc.getSynSubbandTree(t, c).resLvl;
- return mressrc.getTileCompWidth(t, c, rl);
- }
-
- /// Returns the height in pixels of the specified tile-component.
- ///
- /// This default implementation returns the value of the source at the
- /// current reconstruction resolution level.
- ///
- ///
- /// The tile index.
- ///
- ///
- /// The index of the component, from 0 to N-1.
- ///
- ///
- /// The height in pixels of component n in tile
- /// t.
- ///
- ///
- public virtual int getTileCompHeight(int t, int c)
- {
- // Retrieves the tile-component maximum resolution index and gets the
- // height from the source.
- int rl = mressrc.getSynSubbandTree(t, c).resLvl;
- return mressrc.getTileCompHeight(t, c, rl);
- }
-
- /// Returns the width in pixels of the specified component in the overall
- /// image.
- ///
- ///
- /// The index of the component, from 0 to N-1.
- ///
- ///
- /// The width in pixels of component c in the overall
- /// image.
- ///
- ///
- public virtual int getCompImgWidth(int c)
- {
- // Retrieves the component maximum resolution index and gets the width
- // from the source module.
- int rl = decSpec.dls.getMinInComp(c);
- return mressrc.getCompImgWidth(c, rl);
- }
-
- /// Returns the height in pixels of the specified component in the overall
- /// image.
- ///
- /// This default implementation returns the value of the source at the
- /// current reconstruction resolution level.
- ///
- ///
- /// The index of the component, from 0 to N-1.
- ///
- ///
- /// The height in pixels of component n in the overall
- /// image.
- ///
- ///
- public virtual int getCompImgHeight(int c)
- {
- // Retrieves the component maximum resolution index and gets the
- // height from the source module.
- int rl = decSpec.dls.getMinInComp(c);
- return mressrc.getCompImgHeight(c, rl);
- }
-
- /// Changes the current tile, given the new indices. An
- /// IllegalArgumentException is thrown if the coordinates do not correspond
- /// to a valid tile.
- ///
- /// This default implementation calls the same method on the source.
- ///
- ///
- /// The horizontal index of the tile.
- ///
- ///
- /// The vertical index of the new tile.
- ///
- ///
- public virtual void setTile(int x, int y)
- {
- mressrc.setTile(x, y);
- }
-
- /// Advances to the next tile, in standard scan-line order (by rows then
- /// columns). An NoNextElementException is thrown if the current tile is
- /// the last one (i.e. there is no next tile).
- ///
- /// This default implementation calls the same method on the source.
- ///
- ///
- public virtual void nextTile()
- {
- mressrc.nextTile();
- }
-
- /// Returns the indixes of the current tile. These are the horizontal and
- /// vertical indexes of the current tile.
- ///
- /// This default implementation returns the value of the source.
- ///
- ///
- /// If not null this object is used to return the information. If
- /// null a new one is created and returned.
- ///
- ///
- /// The current tile's indices (vertical and horizontal indexes).
- ///
- ///
- public virtual Coord getTile(Coord co)
- {
- return mressrc.getTile(co);
- }
-
- /// Returns the horizontal coordinate of the upper-left corner of the
- /// specified component in the current tile.
- ///
- ///
- /// The component index.
- ///
- ///
- public virtual int getCompULX(int c)
- {
- // Find tile-component maximum resolution index and gets information
- // from the source module.
- int tIdx = TileIdx;
- int rl = mressrc.getSynSubbandTree(tIdx, c).resLvl;
- return mressrc.getResULX(c, rl);
- }
-
- /// Returns the vertical coordinate of the upper-left corner of the
- /// specified component in the current tile.
- ///
- ///
- /// The component index.
- ///
- ///
- public virtual int getCompULY(int c)
- {
- // Find tile-component maximum resolution index and gets information
- // from the source module.
- int tIdx = TileIdx;
- int rl = mressrc.getSynSubbandTree(tIdx, c).resLvl;
- return mressrc.getResULY(c, rl);
- }
-
- /// Returns the number of tiles in the horizontal and vertical directions.
- ///
- /// This default implementation returns the value of the source.
- ///
- ///
- /// If not null this object is used to return the information. If
- /// null a new one is created and returned.
- ///
- ///
- /// The number of tiles in the horizontal (Coord.x) and vertical
- /// (Coord.y) directions.
- ///
- ///
- public virtual Coord getNumTiles(Coord co)
- {
- return mressrc.getNumTiles(co);
- }
-
- /// Returns the total number of tiles in the image.
- ///
- /// This default implementation returns the value of the source.
- ///
- ///
- /// The total number of tiles in the image.
- ///
- ///
- public virtual int getNumTiles()
- {
- return mressrc.getNumTiles();
- }
-
- /// Returns the specified synthesis subband tree
- ///
- ///
- /// Tile index.
- ///
- ///
- /// Component index.
- ///
- ///
- public virtual SubbandSyn getSynSubbandTree(int t, int c)
- {
- return mressrc.getSynSubbandTree(t, c);
- }
- public abstract bool isReversible(int param1, int param2);
- public abstract int getNomRangeBits(int param1);
- public abstract int getImplementationType(int param1);
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/wavelet/synthesis/InvWTData.cs b/CSJ2K/j2k/wavelet/synthesis/InvWTData.cs
deleted file mode 100644
index 446cf810..00000000
--- a/CSJ2K/j2k/wavelet/synthesis/InvWTData.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
-* CVS identifier:
-*
-* $Id: InvWTData.java,v 1.15 2001/09/20 13:07:09 grosbois Exp $
-*
-* Class: InvWTData
-*
-* Description:
-*
-*
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-* */
-namespace CSJ2K.j2k.wavelet.synthesis
-{
-
- /// This interface extends the MultiResImgData interface with the methods that
- /// are necessary for inverse wavelet data (i.e. data that is the source to an
- /// inverse wavlet trasnform).
- ///
- ///
- public interface InvWTData : MultiResImgData
- {
- /// Returns the horizontal code-block partition origin. Allowable values
- /// are 0 and 1, nothing else.
- ///
- ///
- int CbULX
- {
- get;
-
- }
- /// Returns the vertical code-block partition origin Allowable values are 0
- /// and 1, nothing else.
- ///
- ///
- int CbULY
- {
- get;
-
- }
-
- /// Returns the subband tree, for the specified tile-component. This method
- /// returns the root element of the subband tree structure, see 'Subband'
- /// and 'SubbandSyn'. The tree comprises all the available resolution
- /// levels.
- ///
- ///
- /// The index of the tile, from 0 to T-1.
- ///
- ///
- /// The index of the component, from 0 to C-1.
- ///
- ///
- /// The root of the tree structure.
- ///
- ///
- new SubbandSyn getSynSubbandTree(int t, int c);
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/wavelet/synthesis/InvWTFull.cs b/CSJ2K/j2k/wavelet/synthesis/InvWTFull.cs
deleted file mode 100644
index 2a8a1140..00000000
--- a/CSJ2K/j2k/wavelet/synthesis/InvWTFull.cs
+++ /dev/null
@@ -1,738 +0,0 @@
-/*
-* CVS identifier:
-*
-* $Id: InvWTFull.java,v 1.20 2002/05/22 15:01:32 grosbois Exp $
-*
-* Class: InvWTFull
-*
-* Description: This class implements a full page inverse DWT for
-* int and float data.
-*
-* the InvWTFullInt and InvWTFullFloat
-* classes by Bertrand Berthelot, Apr-19-1999
-*
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-* */
-using CSJ2K.j2k.decoder;
-using CSJ2K.j2k.image;
-using CSJ2K.j2k.util;
-using System;
-using System.Collections.Generic;
-namespace CSJ2K.j2k.wavelet.synthesis
-{
-
- /// This class implements the InverseWT with the full-page approach for int and
- /// float data.
- ///
- /// The image can be reconstructed at different (image) resolution levels
- /// indexed from the lowest resolution available for each tile-component. This
- /// is controlled by the setImgResLevel() method.
- ///
- /// Note: Image resolution level indexes may differ from tile-component
- /// resolution index. They are indeed indexed starting from the lowest number
- /// of decomposition levels of each component of each tile.
- ///
- /// Example: For an image (1 tile) with 2 components (component 0 having 2
- /// decomposition levels and component 1 having 3 decomposition levels), the
- /// first (tile-) component has 3 resolution levels and the second one has 4
- /// resolution levels, whereas the image has only 3 resolution levels
- /// available.
- ///
- /// This implementation does not support progressive data: Data is
- /// considered to be non-progressive (i.e. "final" data) and the 'progressive'
- /// attribute of the 'DataBlk' class is always set to false, see the 'DataBlk'
- /// class.
- ///
- ///
- ///
- ///
- ///
- public class InvWTFull : InverseWT
- {
-
- /// Reference to the ProgressWatch instance if any
- private ProgressWatch pw = null;
-
- /// The total number of code-blocks to decode
- private int cblkToDecode = 0;
-
- /// The number of already decoded code-blocks
- private int nDecCblk = 0;
-
- /// the code-block buffer's source i.e. the quantizer
- private CBlkWTDataSrcDec src;
-
- /// Current data type
- private int dtype;
-
- /// Block storing the reconstructed image for each component
- private DataBlk[] reconstructedComps;
-
- /// Number of decomposition levels in each component
- private int[] ndl;
-
- /// The reversible flag for each component in each tile. The first index is
- /// the tile index, the second one is the component index. The
- /// reversibility of the components for each tile are calculated on a as
- /// needed basis.
- ///
- ///
- private Dictionary reversible = new Dictionary();
- //private bool[][] reversible;
-
- /// Initializes this object with the given source of wavelet
- /// coefficients. It initializes the resolution level for full resolutioin
- /// reconstruction.
- ///
- ///
- /// from where the wavelet coefficinets should be obtained.
- ///
- ///
- /// The decoder specifications
- ///
- ///
- public InvWTFull(CBlkWTDataSrcDec src, DecoderSpecs decSpec) : base(src, decSpec)
- {
- this.src = src;
- int nc = src.NumComps;
- reconstructedComps = new DataBlk[nc];
- ndl = new int[nc];
- pw = FacilityManager.ProgressWatch;
- }
-
- /// Returns the reversibility of the current subband. It computes
- /// iteratively the reversibility of the child subbands. For each subband
- /// it tests the reversibility of the horizontal and vertical synthesis
- /// filters used to reconstruct this subband.
- ///
- ///
- /// The current subband.
- ///
- ///
- /// true if all the filters used to reconstruct the current
- /// subband are reversible
- ///
- ///
- private bool isSubbandReversible(Subband subband)
- {
- if (subband.isNode)
- {
- // It's reversible if the filters to obtain the 4 subbands are
- // reversible and the ones for this one are reversible too.
- return isSubbandReversible(subband.LL) && isSubbandReversible(subband.HL) && isSubbandReversible(subband.LH) && isSubbandReversible(subband.HH) && ((SubbandSyn)subband).hFilter.Reversible && ((SubbandSyn)subband).vFilter.Reversible;
- }
- else
- {
- // Leaf subband. Reversibility of data depends on source, so say
- // it's true
- return true;
- }
- }
-
- /// Returns the reversibility of the wavelet transform for the specified
- /// component, in the current tile. A wavelet transform is reversible when
- /// it is suitable for lossless and lossy-to-lossless compression.
- ///
- ///
- /// The index of the tile.
- ///
- ///
- /// The index of the component.
- ///
- ///
- /// true is the wavelet transform is reversible, false if not.
- ///
- ///
- public override bool isReversible(int t, int c)
- {
- if (reversible[t] == null)
- {
- // Reversibility not yet calculated for this tile
- reversible[t] = new bool[NumComps];
- for (int i = reversible[t].Length - 1; i >= 0; i--)
- {
- reversible[t][i] = isSubbandReversible(src.getSynSubbandTree(t, i));
- }
- }
- return reversible[t][c];
- }
-
- /// Returns the number of bits, referred to as the "range bits",
- /// corresponding to the nominal range of the data in the specified
- /// component.
- ///
- /// The returned value corresponds to the nominal dynamic range of the
- /// reconstructed image data, as long as the getNomRangeBits() method of
- /// the source returns a value corresponding to the nominal dynamic range
- /// of the image data and not not of the wavelet coefficients.
- ///
- /// If this number is b then for unsigned data the nominal range
- /// is between 0 and 2^b-1, and for signed data it is between -2^(b-1) and
- /// 2^(b-1)-1.
- ///
- ///
- /// The index of the component.
- ///
- ///
- /// The number of bits corresponding to the nominal range of the
- /// data.
- ///
- ///
- public override int getNomRangeBits(int c)
- {
- return src.getNomRangeBits(c);
- }
-
- /// Returns the position of the fixed point in the specified
- /// component. This is the position of the least significant integral
- /// (i.e. non-fractional) bit, which is equivalent to the number of
- /// fractional bits. For instance, for fixed-point values with 2 fractional
- /// bits, 2 is returned. For floating-point data this value does not apply
- /// and 0 should be returned. Position 0 is the position of the least
- /// significant bit in the data.
- ///
- /// This default implementation assumes that the wavelet transform does
- /// not modify the fixed point. If that were the case this method should be
- /// overriden.
- ///
- ///
- /// The index of the component.
- ///
- ///
- /// The position of the fixed-point, which is the same as the
- /// number of fractional bits. For floating-point data 0 is returned.
- ///
- ///
- public override int getFixedPoint(int c)
- {
- return src.getFixedPoint(c);
- }
-
- /// Returns a block of image data containing the specifed rectangular area,
- /// in the specified component, as a reference to the internal buffer (see
- /// below). The rectangular area is specified by the coordinates and
- /// dimensions of the 'blk' object.
- ///
- /// The area to return is specified by the 'ulx', 'uly', 'w' and 'h'
- /// members of the 'blk' argument. These members are not modified by this
- /// method.
- ///
- /// The data returned by this method can be the data in the internal
- /// buffer of this object, if any, and thus can not be modified by the
- /// caller. The 'offset' and 'scanw' of the returned data can be
- /// arbitrary. See the 'DataBlk' class.
- ///
- /// The returned data has its 'progressive' attribute unset
- /// (i.e. false).
- ///
- ///
- /// Its coordinates and dimensions specify the area to return.
- ///
- ///
- /// The index of the component from which to get the data.
- ///
- ///
- /// The requested DataBlk
- ///
- ///
- ///
- ///
- ///
- public override DataBlk getInternCompData(DataBlk blk, int c)
- {
- int tIdx = TileIdx;
- if (src.getSynSubbandTree(tIdx, c).HorWFilter == null)
- {
- dtype = DataBlk.TYPE_INT;
- }
- else
- {
- dtype = src.getSynSubbandTree(tIdx, c).HorWFilter.DataType;
- }
-
- //If the source image has not been decomposed
- if (reconstructedComps[c] == null)
- {
- //Allocate component data buffer
- switch (dtype)
- {
-
- case DataBlk.TYPE_FLOAT:
- reconstructedComps[c] = new DataBlkFloat(0, 0, getTileCompWidth(tIdx, c), getTileCompHeight(tIdx, c));
- break;
-
- case DataBlk.TYPE_INT:
- reconstructedComps[c] = new DataBlkInt(0, 0, getTileCompWidth(tIdx, c), getTileCompHeight(tIdx, c));
- break;
- }
- //Reconstruct source image
- waveletTreeReconstruction(reconstructedComps[c], src.getSynSubbandTree(tIdx, c), c);
- if (pw != null && c == src.NumComps - 1)
- {
- pw.terminateProgressWatch();
- }
- }
-
- if (blk.DataType != dtype)
- {
- if (dtype == DataBlk.TYPE_INT)
- {
- blk = new DataBlkInt(blk.ulx, blk.uly, blk.w, blk.h);
- }
- else
- {
- blk = new DataBlkFloat(blk.ulx, blk.uly, blk.w, blk.h);
- }
- }
- // Set the reference to the internal buffer
- blk.Data = reconstructedComps[c].Data;
- blk.offset = reconstructedComps[c].w * blk.uly + blk.ulx;
- blk.scanw = reconstructedComps[c].w;
- blk.progressive = false;
- return blk;
- }
-
- /// Returns a block of image data containing the specifed rectangular area,
- /// in the specified component, as a copy (see below). The rectangular area
- /// is specified by the coordinates and dimensions of the 'blk' object.
- ///
- /// The area to return is specified by the 'ulx', 'uly', 'w' and 'h'
- /// members of the 'blk' argument. These members are not modified by this
- /// method.
- ///
- /// The data returned by this method is always a copy of the internal
- /// data of this object, if any, and it can be modified "in place" without
- /// any problems after being returned. The 'offset' of the returned data is
- /// 0, and the 'scanw' is the same as the block's width. See the 'DataBlk'
- /// class.
- ///
- /// If the data array in 'blk' is null, then a new one is
- /// created. If the data array is not null then it must be big
- /// enough to contain the requested area.
- ///
- /// The returned data always has its 'progressive' attribute unset (i.e
- /// false)
- ///
- ///
- /// Its coordinates and dimensions specify the area to
- /// return. If it contains a non-null data array, then it must be large
- /// enough. If it contains a null data array a new one is created. The
- /// fields in this object are modified to return the data.
- ///
- ///
- /// The index of the component from which to get the data.
- ///
- ///
- /// The requested DataBlk
- ///
- ///
- ///
- ///
- ///
- public override DataBlk getCompData(DataBlk blk, int c)
- {
- //int j;
- System.Object dst_data; // src_data removed
- int[] dst_data_int; // src_data_int removed
- float[] dst_data_float; // src_data_float removed
-
- // To keep compiler happy
- dst_data = null;
-
- // Ensure output buffer
- switch (blk.DataType)
- {
-
- case DataBlk.TYPE_INT:
- dst_data_int = (int[])blk.Data;
- if (dst_data_int == null || dst_data_int.Length < blk.w * blk.h)
- {
- dst_data_int = new int[blk.w * blk.h];
- }
- dst_data = dst_data_int;
- break;
-
- case DataBlk.TYPE_FLOAT:
- dst_data_float = (float[])blk.Data;
- if (dst_data_float == null || dst_data_float.Length < blk.w * blk.h)
- {
- dst_data_float = new float[blk.w * blk.h];
- }
- dst_data = dst_data_float;
- break;
- }
-
- // Use getInternCompData() to get the data, since getInternCompData()
- // returns reference to internal buffer, we must copy it.
- blk = getInternCompData(blk, c);
-
- // Copy the data
- blk.Data = dst_data;
- blk.offset = 0;
- blk.scanw = blk.w;
- return blk;
- }
-
- /// Performs the 2D inverse wavelet transform on a subband of the image, on
- /// the specified component. This method will successively perform 1D
- /// filtering steps on all columns and then all lines of the subband.
- ///
- ///
- /// the buffer for the image/wavelet data.
- ///
- ///
- /// The subband to reconstruct.
- ///
- ///
- /// The index of the component to reconstruct
- ///
- ///
- private void wavelet2DReconstruction(DataBlk db, SubbandSyn sb, int c)
- {
- System.Object data;
- System.Object buf;
- int ulx, uly, w, h;
- int i, j, k;
- int offset;
-
- // If subband is empty (i.e. zero size) nothing to do
- if (sb.w == 0 || sb.h == 0)
- {
- return;
- }
-
- data = db.Data;
-
- ulx = sb.ulx;
- uly = sb.uly;
- w = sb.w;
- h = sb.h;
-
- buf = null; // To keep compiler happy
-
- switch (sb.HorWFilter.DataType)
- {
-
- case DataBlk.TYPE_INT:
- buf = new int[(w >= h) ? w : h];
- break;
-
- case DataBlk.TYPE_FLOAT:
- buf = new float[(w >= h) ? w : h];
- break;
- }
-
- //Perform the horizontal reconstruction
- offset = (uly - db.uly) * db.w + ulx - db.ulx;
- if (sb.ulcx % 2 == 0)
- {
- // start index is even => use LPF
- for (i = 0; i < h; i++, offset += db.w)
- {
- // CONVERSION PROBLEM?
- Array.Copy((System.Array)data, offset, (System.Array)buf, 0, w);
- sb.hFilter.synthetize_lpf(buf, 0, (w + 1) / 2, 1, buf, (w + 1) / 2, w / 2, 1, data, offset, 1);
- }
- }
- else
- {
- // start index is odd => use HPF
- for (i = 0; i < h; i++, offset += db.w)
- {
- // CONVERSION PROBLEM?
- Array.Copy((System.Array)data, offset, (System.Array)buf, 0, w);
- sb.hFilter.synthetize_hpf(buf, 0, w / 2, 1, buf, w / 2, (w + 1) / 2, 1, data, offset, 1);
- }
- }
-
- //Perform the vertical reconstruction
- offset = (uly - db.uly) * db.w + ulx - db.ulx;
- switch (sb.VerWFilter.DataType)
- {
-
- case DataBlk.TYPE_INT:
- int[] data_int, buf_int;
- data_int = (int[])data;
- buf_int = (int[])buf;
- if (sb.ulcy % 2 == 0)
- {
- // start index is even => use LPF
- for (j = 0; j < w; j++, offset++)
- {
- for (i = h - 1, k = offset + i * db.w; i >= 0; i--, k -= db.w)
- buf_int[i] = data_int[k];
- sb.vFilter.synthetize_lpf(buf, 0, (h + 1) / 2, 1, buf, (h + 1) / 2, h / 2, 1, data, offset, db.w);
- }
- }
- else
- {
- // start index is odd => use HPF
- for (j = 0; j < w; j++, offset++)
- {
- for (i = h - 1, k = offset + i * db.w; i >= 0; i--, k -= db.w)
- buf_int[i] = data_int[k];
- sb.vFilter.synthetize_hpf(buf, 0, h / 2, 1, buf, h / 2, (h + 1) / 2, 1, data, offset, db.w);
- }
- }
- break;
-
- case DataBlk.TYPE_FLOAT:
- float[] data_float, buf_float;
- data_float = (float[])data;
- buf_float = (float[])buf;
- if (sb.ulcy % 2 == 0)
- {
- // start index is even => use LPF
- for (j = 0; j < w; j++, offset++)
- {
- for (i = h - 1, k = offset + i * db.w; i >= 0; i--, k -= db.w)
- buf_float[i] = data_float[k];
- sb.vFilter.synthetize_lpf(buf, 0, (h + 1) / 2, 1, buf, (h + 1) / 2, h / 2, 1, data, offset, db.w);
- }
- }
- else
- {
- // start index is odd => use HPF
- for (j = 0; j < w; j++, offset++)
- {
- for (i = h - 1, k = offset + i * db.w; i >= 0; i--, k -= db.w)
- buf_float[i] = data_float[k];
- sb.vFilter.synthetize_hpf(buf, 0, h / 2, 1, buf, h / 2, (h + 1) / 2, 1, data, offset, db.w);
- }
- }
- break;
- }
- }
-
- /// Performs the inverse wavelet transform on the whole component. It
- /// iteratively reconstructs the subbands from leaves up to the root
- /// node. This method is recursive, the first call to it the 'sb' must be
- /// the root of the subband tree. The method will then process the entire
- /// subband tree by calling itslef recursively.
- ///
- ///
- /// The buffer for the image/wavelet data.
- ///
- ///
- /// The subband to reconstruct.
- ///
- ///
- /// The index of the component to reconstruct
- ///
- ///
- private void waveletTreeReconstruction(DataBlk img, SubbandSyn sb, int c)
- {
-
- DataBlk subbData;
-
- // If the current subband is a leaf then get the data from the source
- if (!sb.isNode)
- {
- int i, m, n;
- System.Object src_data, dst_data;
- Coord ncblks;
-
- if (sb.w == 0 || sb.h == 0)
- {
- return; // If empty subband do nothing
- }
-
- // Get all code-blocks in subband
- if (dtype == DataBlk.TYPE_INT)
- {
- subbData = new DataBlkInt();
- }
- else
- {
- subbData = new DataBlkFloat();
- }
- ncblks = sb.numCb;
- dst_data = img.Data;
- for (m = 0; m < ncblks.y; m++)
- {
- for (n = 0; n < ncblks.x; n++)
- {
- subbData = src.getInternCodeBlock(c, m, n, sb, subbData);
- src_data = subbData.Data;
- if (pw != null)
- {
- nDecCblk++;
- pw.updateProgressWatch(nDecCblk, null);
- }
- // Copy the data line by line
- for (i = subbData.h - 1; i >= 0; i--)
- {
- // CONVERSION PROBLEM
- Array.Copy((System.Array)src_data, subbData.offset + i * subbData.scanw, (System.Array)dst_data, (subbData.uly + i) * img.w + subbData.ulx, subbData.w);
- }
- }
- }
- }
- else if (sb.isNode)
- {
- // Reconstruct the lower resolution levels if the current subbands
- // is a node
-
- //Perform the reconstruction of the LL subband
- waveletTreeReconstruction(img, (SubbandSyn)sb.LL, c);
-
- if (sb.resLvl <= reslvl - maxImgRes + ndl[c])
- {
- //Reconstruct the other subbands
- waveletTreeReconstruction(img, (SubbandSyn)sb.HL, c);
- waveletTreeReconstruction(img, (SubbandSyn)sb.LH, c);
- waveletTreeReconstruction(img, (SubbandSyn)sb.HH, c);
-
- //Perform the 2D wavelet decomposition of the current subband
- wavelet2DReconstruction(img, (SubbandSyn)sb, c);
- }
- }
- }
-
- /// Returns the implementation type of this wavelet transform, WT_IMPL_FULL
- /// (full-page based transform). All components return the same.
- ///
- ///
- /// The index of the component.
- ///
- ///
- /// WT_IMPL_FULL
- ///
- ///
- ///
- ///
- ///
- public override int getImplementationType(int c)
- {
- return CSJ2K.j2k.wavelet.WaveletTransform_Fields.WT_IMPL_FULL;
- }
-
- /// Changes the current tile, given the new indexes. An
- /// IllegalArgumentException is thrown if the indexes do not correspond to
- /// a valid tile.
- ///
- ///
- /// The horizontal index of the tile.
- ///
- ///
- /// The vertical index of the new tile.
- ///
- ///
- public override void setTile(int x, int y)
- {
- int i;
-
- // Change tile
- base.setTile(x, y);
-
- int nc = src.NumComps;
- int tIdx = src.TileIdx;
- for (int c = 0; c < nc; c++)
- {
- ndl[c] = src.getSynSubbandTree(tIdx, c).resLvl;
- }
-
- // Reset the decomposed component buffers.
- if (reconstructedComps != null)
- {
- for (i = reconstructedComps.Length - 1; i >= 0; i--)
- {
- reconstructedComps[i] = null;
- }
- }
-
- cblkToDecode = 0;
- SubbandSyn root, sb;
- for (int c = 0; c < nc; c++)
- {
- root = src.getSynSubbandTree(tIdx, c);
- for (int r = 0; r <= reslvl - maxImgRes + root.resLvl; r++)
- {
- if (r == 0)
- {
- sb = (SubbandSyn)root.getSubbandByIdx(0, 0);
- if (sb != null)
- cblkToDecode += sb.numCb.x * sb.numCb.y;
- }
- else
- {
- sb = (SubbandSyn)root.getSubbandByIdx(r, 1);
- if (sb != null)
- cblkToDecode += sb.numCb.x * sb.numCb.y;
- sb = (SubbandSyn)root.getSubbandByIdx(r, 2);
- if (sb != null)
- cblkToDecode += sb.numCb.x * sb.numCb.y;
- sb = (SubbandSyn)root.getSubbandByIdx(r, 3);
- if (sb != null)
- cblkToDecode += sb.numCb.x * sb.numCb.y;
- }
- } // Loop on resolution levels
- } // Loop on components
- nDecCblk = 0;
-
- if (pw != null)
- {
- pw.initProgressWatch(0, cblkToDecode, "Decoding tile " + tIdx + "...");
- }
- }
-
- /// Advances to the next tile, in standard scan-line order (by rows then
- /// columns). An 'NoNextElementException' is thrown if the current tile is
- /// the last one (i.e. there is no next tile).
- ///
- ///
- public override void nextTile()
- {
- int i;
-
- // Change tile
- base.nextTile();
-
- int nc = src.NumComps;
- int tIdx = src.TileIdx;
- for (int c = 0; c < nc; c++)
- {
- ndl[c] = src.getSynSubbandTree(tIdx, c).resLvl;
- }
-
- // Reset the decomposed component buffers.
- if (reconstructedComps != null)
- {
- for (i = reconstructedComps.Length - 1; i >= 0; i--)
- {
- reconstructedComps[i] = null;
- }
- }
- }
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/wavelet/synthesis/InverseWT.cs b/CSJ2K/j2k/wavelet/synthesis/InverseWT.cs
deleted file mode 100644
index 398e400d..00000000
--- a/CSJ2K/j2k/wavelet/synthesis/InverseWT.cs
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
-* CVS identifier:
-*
-* $Id: InverseWT.java,v 1.34 2001/10/09 12:52:55 grosbois Exp $
-*
-* Class: InverseWT
-*
-* Description: This interface defines the specifics
-* of inverse wavelet transforms.
-*
-*
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-* */
-using CSJ2K.j2k.decoder;
-using CSJ2K.j2k.image;
-namespace CSJ2K.j2k.wavelet.synthesis
-{
-
- /// This abstract class extends the WaveletTransform one with the specifics of
- /// inverse wavelet transforms.
- ///
- /// The image can be reconstructed at different resolution levels. This is
- /// controlled by the setResLevel() method. All the image, tile and component
- /// dimensions are relative the the resolution level being used. The number of
- /// resolution levels indicates the number of wavelet recompositions that will
- /// be used, if it is equal as the number of decomposition levels then the full
- /// resolution image is reconstructed.
- ///
- /// It is assumed in this class that all tiles and components the same
- /// reconstruction resolution level. If that where not the case the
- /// implementing class should have additional data structures to store those
- /// values for each tile. However, the 'recResLvl' member variable always
- /// contain the values applicable to the current tile, since many methods
- /// implemented here rely on them.
- ///
- ///
- public abstract class InverseWT : InvWTAdapter, BlkImgDataSrc
- {
-
- /// Initializes this object with the given source of wavelet
- /// coefficients. It initializes the resolution level for full resolutioin
- /// reconstruction (i.e. the maximum resolution available from the 'src'
- /// source).
- ///
- /// It is assumed here that all tiles and components have the same
- /// reconstruction resolution level. If that was not the case it should be
- /// the value for the current tile of the source.
- ///
- ///
- /// from where the wavelet coefficinets should be obtained.
- ///
- ///
- /// The decoder specifications
- ///
- ///
- public InverseWT(MultiResImgData src, DecoderSpecs decSpec) : base(src, decSpec)
- {
- }
-
- /// Creates an InverseWT object that works on the data type of the source,
- /// with the special additional parameters from the parameter
- /// list. Currently the parameter list is ignored since no special
- /// parameters can be specified for the inverse wavelet transform yet.
- ///
- ///
- /// The source of data for the inverse wavelet
- /// transform.
- ///
- ///
- /// The parameter list containing parameters applicable to the
- /// inverse wavelet transform (other parameters can also be present).
- ///
- ///
- public static InverseWT createInstance(CBlkWTDataSrcDec src, DecoderSpecs decSpec)
- {
-
- // full page wavelet transform
- return new InvWTFull(src, decSpec);
- }
- public abstract int getFixedPoint(int param1);
- public abstract CSJ2K.j2k.image.DataBlk getInternCompData(CSJ2K.j2k.image.DataBlk param1, int param2);
- public abstract CSJ2K.j2k.image.DataBlk getCompData(CSJ2K.j2k.image.DataBlk param1, int param2);
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/wavelet/synthesis/MultiResImgData.cs b/CSJ2K/j2k/wavelet/synthesis/MultiResImgData.cs
deleted file mode 100644
index 7fac6e4f..00000000
--- a/CSJ2K/j2k/wavelet/synthesis/MultiResImgData.cs
+++ /dev/null
@@ -1,417 +0,0 @@
-/*
-* CVS identifier:
-*
-* $Id: MultiResImgData.java,v 1.11 2002/07/25 15:11:33 grosbois Exp $
-*
-* Class: MultiResImgData
-*
-* Description: The interface for classes that provide
-* multi-resolution image data.
-*
-*
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-* */
-using CSJ2K.j2k.image;
-namespace CSJ2K.j2k.wavelet.synthesis
-{
-
- /// This interface defines methods to access image attributes (width, height,
- /// number of components, etc.) of multiresolution images, such as those
- /// resulting from an inverse wavelet transform. The image can be tiled or not
- /// (i.e. if the image is not tiled then there is only 1 tile). It should be
- /// implemented by all classes that provide multi-resolution image data, such
- /// as entropy decoders, dequantizers, etc. This interface, however, does not
- /// define methods to transfer image data (i.e. pixel data), that is defined by
- /// other interfaces, such as 'CBlkQuantDataSrcDec'.
- ///
- /// This interface is very similar to the 'ImgData' one. It differs only by
- /// the fact that it handles multiple resolutions.
- ///
- /// Resolution levels are counted from 0 to L. Resolution level 0 is the
- /// lower resolution, while L is the maximum resolution level, or full
- /// resolution, which is returned by 'getMaxResLvl()'. Note that there are L+1
- /// resolution levels available.
- ///
- /// As in the 'ImgData' interface a multi-resolution image lies on top of a
- /// canvas. The canvas coordinates are mapped from the full resolution
- /// reference grid (i.e. resolution level 'L' reference grid) to a resolution
- /// level 'l' reference grid by '(x_l,y_l) =
- /// (ceil(x_l/2^(L-l)),ceil(y_l/2^(L-l)))', where '(x,y)' are the full
- /// resolution reference grid coordinates and '(x_l,y_l)' are the level 'l'
- /// reference grid coordinates.
- ///
- /// For details on the canvas system and its implications consult the
- /// 'ImgData' interface.
- ///
- /// Note that tile sizes may not be obtained by simply dividing the tile
- /// size in the reference grid by the subsampling factor.
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public interface MultiResImgData
- {
- /// Returns the nominal tiles width
- int NomTileWidth
- {
- get;
-
- }
- /// Returns the nominal tiles height
- int NomTileHeight
- {
- get;
-
- }
- /// Returns the number of components in the image.
- ///
- ///
- /// The number of components in the image.
- ///
- ///
- int NumComps
- {
- get;
-
- }
- /// Returns the index of the current tile, relative to a standard scan-line
- /// order.
- ///
- ///
- /// The current tile's index (starts at 0).
- ///
- ///
- int TileIdx
- {
- get;
-
- }
- /// Returns the horizontal tile partition offset in the reference grid
- int TilePartULX
- {
- get;
-
- }
- /// Returns the vertical tile partition offset in the reference grid
- int TilePartULY
- {
- get;
-
- }
-
- /// Returns the overall width of the current tile in pixels for the given
- /// resolution level. This is the tile's width without accounting for any
- /// component subsampling. The resolution level is indexed from the lowest
- /// number of resolution levels of all components of the current tile.
- ///
- ///
- /// The resolution level, from 0 to L.
- ///
- ///
- /// The total current tile's width in pixels.
- ///
- ///
- int getTileWidth(int rl);
-
- /// Returns the overall height of the current tile in pixels, for the given
- /// resolution level. This is the tile's height without accounting for any
- /// component subsampling. The resolution level is indexed from the lowest
- /// number of resolution levels of all components of the current tile.
- ///
- ///
- /// The resolution level, from 0 to L.
- ///
- ///
- /// The total current tile's height in pixels.
- ///
- ///
- int getTileHeight(int rl);
-
- /// Returns the overall width of the image in pixels, for the given
- /// resolution level. This is the image's width without accounting for any
- /// component subsampling or tiling. The resolution level is indexed from
- /// the lowest number of resolution levels of all components of the current
- /// tile.
- ///
- ///
- /// The resolution level, from 0 to L.
- ///
- ///
- /// The total image's width in pixels.
- ///
- ///
- int getImgWidth(int rl);
-
- /// Returns the overall height of the image in pixels, for the given
- /// resolution level. This is the image's height without accounting for any
- /// component subsampling or tiling. The resolution level is indexed from
- /// the lowest number of resolution levels of all components of the current
- /// tile.
- ///
- ///
- /// The resolution level, from 0 to L.
- ///
- ///
- /// The total image's height in pixels.
- ///
- ///
- int getImgHeight(int rl);
-
- /// Returns the component subsampling factor in the horizontal direction,
- /// for the specified component. This is, approximately, the ratio of
- /// dimensions between the reference grid and the component itself, see the
- /// 'ImgData' interface desription for details.
- ///
- ///
- /// The index of the component (between 0 and N-1)
- ///
- ///
- /// The horizontal subsampling factor of component 'c'
- ///
- ///
- ///
- ///
- ///
- int getCompSubsX(int c);
-
- /// Returns the component subsampling factor in the vertical direction, for
- /// the specified component. This is, approximately, the ratio of
- /// dimensions between the reference grid and the component itself, see the
- /// 'ImgData' interface desription for details.
- ///
- ///
- /// The index of the component (between 0 and N-1)
- ///
- ///
- /// The vertical subsampling factor of component 'c'
- ///
- ///
- ///
- ///
- ///
- int getCompSubsY(int c);
-
- /// Returns the width in pixels of the specified tile-component for the
- /// given resolution level.
- ///
- ///
- /// Tile index
- ///
- ///
- /// The index of the component, from 0 to N-1.
- ///
- ///
- /// The resolution level, from 0 to L.
- ///
- ///
- /// The width in pixels of component c in tile t
- /// for resolution rl.
- ///
- ///
- int getTileCompWidth(int t, int c, int rl);
-
- /// Returns the height in pixels of the specified tile-component for the
- /// given resolution level.
- ///
- ///
- /// The tile index.
- ///
- ///
- /// The index of the component, from 0 to N-1.
- ///
- ///
- /// The resolution level, from 0 to L.
- ///
- ///
- /// The height in pixels of component c in tile
- /// t.
- ///
- ///
- int getTileCompHeight(int t, int c, int rl);
-
- /// Returns the width in pixels of the specified component in the overall
- /// image, for the given resolution level.
- ///
- ///
- /// The index of the component, from 0 to N-1.
- ///
- ///
- /// The resolution level, from 0 to L.
- ///
- ///
- /// The width in pixels of component c in the overall
- /// image.
- ///
- ///
- int getCompImgWidth(int c, int rl);
-
- /// Returns the height in pixels of the specified component in the overall
- /// image, for the given resolution level.
- ///
- ///
- /// The index of the component, from 0 to N-1.
- ///
- ///
- /// The resolution level, from 0 to L.
- ///
- ///
- /// The height in pixels of component n in the overall
- /// image.
- ///
- ///
- int getCompImgHeight(int n, int rl);
-
- /// Changes the current tile, given the new indexes. An
- /// IllegalArgumentException is thrown if the indexes do not correspond to
- /// a valid tile.
- ///
- ///
- /// The horizontal indexes the tile.
- ///
- ///
- /// The vertical indexes of the new tile.
- ///
- ///
- void setTile(int x, int y);
-
- /// Advances to the next tile, in standard scan-line order (by rows then
- /// columns). An NoNextElementException is thrown if the current tile is
- /// the last one (i.e. there is no next tile).
- ///
- ///
- void nextTile();
-
- /// Returns the indexes of the current tile. These are the horizontal and
- /// vertical indexes of the current tile.
- ///
- ///
- /// If not null this object is used to return the information. If
- /// null a new one is created and returned.
- ///
- ///
- /// The current tile's indexes (vertical and horizontal indexes).
- ///
- ///
- Coord getTile(Coord co);
-
- /// Returns the horizontal coordinate of the upper-left corner of the
- /// specified resolution in the given component of the current tile.
- ///
- ///
- /// The component index.
- ///
- ///
- /// The resolution level index.
- ///
- ///
- int getResULX(int c, int rl);
-
- /// Returns the vertical coordinate of the upper-left corner of the
- /// specified resolution in the given component of the current tile.
- ///
- ///
- /// The component index.
- ///
- ///
- /// The resolution level index.
- ///
- ///
- int getResULY(int c, int rl);
-
- /// Returns the horizontal coordinate of the image origin, the top-left
- /// corner, in the canvas system, on the reference grid at the specified
- /// resolution level. The resolution level is indexed from the lowest
- /// number of resolution levels of all components of the current tile.
- ///
- ///
- /// The resolution level, from 0 to L.
- ///
- ///
- /// The horizontal coordinate of the image origin in the canvas
- /// system, on the reference grid.
- ///
- ///
- int getImgULX(int rl);
-
- /// Returns the vertical coordinate of the image origin, the top-left
- /// corner, in the canvas system, on the reference grid at the specified
- /// resolution level. The resolution level is indexed from the lowest
- /// number of resolution levels of all components of the current tile.
- ///
- ///
- /// The resolution level, from 0 to L.
- ///
- ///
- /// The vertical coordinate of the image origin in the canvas
- /// system, on the reference grid.
- ///
- ///
- int getImgULY(int rl);
-
- /// Returns the number of tiles in the horizontal and vertical directions.
- ///
- ///
- /// If not null this object is used to return the information. If
- /// null a new one is created and returned.
- ///
- ///
- /// The number of tiles in the horizontal (Coord.x) and vertical
- /// (Coord.y) directions.
- ///
- ///
- Coord getNumTiles(Coord co);
-
- /// Returns the total number of tiles in the image.
- ///
- ///
- /// The total number of tiles in the image.
- ///
- ///
- int getNumTiles();
-
- /// Returns the specified synthesis subband tree
- ///
- ///
- /// Tile index.
- ///
- ///
- /// Component index.
- ///
- ///
- SubbandSyn getSynSubbandTree(int t, int c);
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/wavelet/synthesis/MultiResImgDataAdapter.cs b/CSJ2K/j2k/wavelet/synthesis/MultiResImgDataAdapter.cs
deleted file mode 100644
index 42a43dd9..00000000
--- a/CSJ2K/j2k/wavelet/synthesis/MultiResImgDataAdapter.cs
+++ /dev/null
@@ -1,517 +0,0 @@
-/*
-* CVS identifier:
-*
-* $Id: MultiResImgDataAdapter.java,v 1.10 2002/07/25 15:11:55 grosbois Exp $
-*
-* Class: MultiResImgDataAdapter
-*
-* Description: A default implementation of the MultiResImgData
-* interface that has and MultiResImgData source
-* and just returns the values of the source.
-*
-*
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-* */
-using CSJ2K.j2k.image;
-namespace CSJ2K.j2k.wavelet.synthesis
-{
-
- /// This class provides a default implementation for the methods of the
- /// 'MultiResImgData' interface. The default implementation consists just in
- /// returning the value of the source, where the source is another
- /// 'MultiResImgData' object.
- ///
- /// This abstract class can be used to facilitate the development of other
- /// classes that implement 'MultiResImgData'. For example a dequantizer can
- /// inherit from this class and all the trivial methods do not have to be
- /// reimplemented.
- ///
- /// If the default implementation of a method provided in this class does
- /// not suit a particular implementation of the 'MultiResImgData' interface,
- /// the method can be overriden to implement the proper behaviour.
- ///
- ///
- ///
- ///
- ///
- public abstract class MultiResImgDataAdapter : MultiResImgData
- {
- /// Returns the nominal tiles width
- virtual public int NomTileWidth
- {
- get
- {
- return mressrc.NomTileWidth;
- }
-
- }
- /// Returns the nominal tiles height
- virtual public int NomTileHeight
- {
- get
- {
- return mressrc.NomTileHeight;
- }
-
- }
- /// Returns the number of components in the image.
- ///
- /// This default implementation returns the value of the source.
- ///
- ///
- /// The number of components in the image.
- ///
- ///
- virtual public int NumComps
- {
- get
- {
- return mressrc.NumComps;
- }
-
- }
- /// Returns the index of the current tile, relative to a standard scan-line
- /// order.
- ///
- /// This default implementation returns the value of the source.
- ///
- ///
- /// The current tile's index (starts at 0).
- ///
- ///
- virtual public int TileIdx
- {
- get
- {
- return mressrc.TileIdx;
- }
-
- }
- /// Returns the horizontal tile partition offset in the reference grid
- virtual public int TilePartULX
- {
- get
- {
- return mressrc.TilePartULX;
- }
-
- }
- /// Returns the vertical tile partition offset in the reference grid
- virtual public int TilePartULY
- {
- get
- {
- return mressrc.TilePartULY;
- }
-
- }
-
- /// Index of the current tile
- protected internal int tIdx = 0;
-
- /// The MultiResImgData source
- protected internal MultiResImgData mressrc;
-
- /// Instantiates the MultiResImgDataAdapter object specifying the
- /// MultiResImgData source.
- ///
- ///
- /// From where to obrtain the MultiResImgData values.
- ///
- ///
- protected internal MultiResImgDataAdapter(MultiResImgData src)
- {
- mressrc = src;
- }
-
- /// Returns the overall width of the current tile in pixels, for the given
- /// resolution level. This is the tile's width without accounting for any
- /// component subsampling.
- ///
- /// This default implementation returns the value of the source.
- ///
- ///
- /// The resolution level, from 0 to L.
- ///
- ///
- /// The total current tile's width in pixels.
- ///
- ///
- public virtual int getTileWidth(int rl)
- {
- return mressrc.getTileWidth(rl);
- }
-
- /// Returns the overall height of the current tile in pixels, for the given
- /// resolution level. This is the tile's height without accounting for any
- /// component subsampling.
- ///
- /// This default implementation returns the value of the source.
- ///
- ///
- /// The resolution level, from 0 to L.
- ///
- ///
- /// The total current tile's height in pixels.
- ///
- ///
- public virtual int getTileHeight(int rl)
- {
- return mressrc.getTileHeight(rl);
- }
-
- /// Returns the overall width of the image in pixels, for the given
- /// resolution level. This is the image's width without accounting for any
- /// component subsampling or tiling.
- ///
- /// This default implementation returns the value of the source.
- ///
- ///
- /// The resolution level, from 0 to L.
- ///
- ///
- /// The total image's width in pixels.
- ///
- ///
- public virtual int getImgWidth(int rl)
- {
- return mressrc.getImgWidth(rl);
- }
-
- /// Returns the overall height of the image in pixels, for the given
- /// resolution level. This is the image's height without accounting for any
- /// component subsampling or tiling.
- ///
- /// This default implementation returns the value of the source.
- ///
- ///
- /// The resolution level, from 0 to L.
- ///
- ///
- /// The total image's height in pixels.
- ///
- ///
- public virtual int getImgHeight(int rl)
- {
- return mressrc.getImgHeight(rl);
- }
-
- /// Returns the component subsampling factor in the horizontal direction,
- /// for the specified component. This is, approximately, the ratio of
- /// dimensions between the reference grid and the component itself, see the
- /// 'ImgData' interface desription for details.
- ///
- /// This default implementation returns the value of the source.
- ///
- ///
- /// The index of the component (between 0 and N-1)
- ///
- ///
- /// The horizontal subsampling factor of component 'c'
- ///
- ///
- ///
- ///
- ///
- public virtual int getCompSubsX(int c)
- {
- return mressrc.getCompSubsX(c);
- }
-
- /// Returns the component subsampling factor in the vertical direction, for
- /// the specified component. This is, approximately, the ratio of
- /// dimensions between the reference grid and the component itself, see the
- /// 'ImgData' interface desription for details.
- ///
- /// This default implementation returns the value of the source.
- ///
- ///
- /// The index of the component (between 0 and N-1)
- ///
- ///
- /// The vertical subsampling factor of component 'c'
- ///
- ///
- ///
- ///
- ///
- public virtual int getCompSubsY(int c)
- {
- return mressrc.getCompSubsY(c);
- }
-
- /// Returns the width in pixels of the specified tile-component for the
- /// given resolution level.
- ///
- /// This default implementation returns the value of the source.
- ///
- ///
- /// Tile index.
- ///
- ///
- /// The index of the component, from 0 to N-1.
- ///
- ///
- /// The resolution level, from 0 to L.
- ///
- ///
- /// The width in pixels of component c in tile t
- /// for resolution level rl.
- ///
- ///
- public virtual int getTileCompWidth(int t, int c, int rl)
- {
- return mressrc.getTileCompWidth(t, c, rl);
- }
-
- /// Returns the height in pixels of the specified tile-component for the
- /// given resolution level.
- ///
- /// This default implementation returns the value of the source.
- ///
- ///
- /// The tile index.
- ///
- ///
- /// The index of the component, from 0 to N-1.
- ///
- ///
- /// The resolution level, from 0 to L.
- ///
- ///
- /// The height in pixels of component c in tile
- /// t.
- ///
- ///
- public virtual int getTileCompHeight(int t, int c, int rl)
- {
- return mressrc.getTileCompHeight(t, c, rl);
- }
-
- /// Returns the width in pixels of the specified component in the overall
- /// image, for the given resolution level.
- ///
- /// This default implementation returns the value of the source.
- ///
- ///
- /// The index of the component, from 0 to N-1.
- ///
- ///
- /// The resolution level, from 0 to L.
- ///
- ///
- /// The width in pixels of component c in the overall
- /// image.
- ///
- ///
- public virtual int getCompImgWidth(int c, int rl)
- {
- return mressrc.getCompImgWidth(c, rl);
- }
-
- /// Returns the height in pixels of the specified component in the overall
- /// image, for the given resolution level.
- ///
- /// This default implementation returns the value of the source.
- ///
- ///
- /// The index of the component, from 0 to N-1.
- ///
- ///
- /// The resolution level, from 0 to L.
- ///
- ///
- /// The height in pixels of component c in the overall
- /// image.
- ///
- ///
- public virtual int getCompImgHeight(int c, int rl)
- {
- return mressrc.getCompImgHeight(c, rl);
- }
-
- /// Changes the current tile, given the new indexes. An
- /// IllegalArgumentException is thrown if the indexes do not correspond to
- /// a valid tile.
- ///
- /// This default implementation just changes the tile in the source.
- ///
- ///
- /// The horizontal indexes the tile.
- ///
- ///
- /// The vertical indexes of the new tile.
- ///
- ///
- public virtual void setTile(int x, int y)
- {
- mressrc.setTile(x, y);
- tIdx = TileIdx;
- }
-
- /// Advances to the next tile, in standard scan-line order (by rows then
- /// columns). An NoNextElementException is thrown if the current tile is
- /// the last one (i.e. there is no next tile).
- ///
- /// This default implementation just changes the tile in the source.
- ///
- ///
- public virtual void nextTile()
- {
- mressrc.nextTile();
- tIdx = TileIdx;
- }
-
- /// Returns the indexes of the current tile. These are the horizontal and
- /// vertical indexes of the current tile.
- ///
- /// This default implementation returns the value of the source.
- ///
- ///
- /// If not null this object is used to return the information. If
- /// null a new one is created and returned.
- ///
- ///
- /// The current tile's indexes (vertical and horizontal indexes).
- ///
- ///
- public virtual Coord getTile(Coord co)
- {
- return mressrc.getTile(co);
- }
-
- /// Returns the horizontal coordinate of the upper-left corner of the
- /// specified resolution level in the given component of the current tile.
- ///
- /// This default implementation returns the value of the source.
- ///
- ///
- /// The component index.
- ///
- ///
- /// The resolution level index.
- ///
- ///
- public virtual int getResULX(int c, int rl)
- {
- return mressrc.getResULX(c, rl);
- }
-
- /// Returns the vertical coordinate of the upper-left corner of the
- /// specified resolution in the given component of the current tile.
- ///
- /// This default implementation returns the value of the source.
- ///
- ///
- /// The component index.
- ///
- ///
- /// The resolution level index.
- ///
- ///
- public virtual int getResULY(int c, int rl)
- {
- return mressrc.getResULY(c, rl);
- }
-
- /// Returns the horizontal coordinate of the image origin, the top-left
- /// corner, in the canvas system, on the reference grid at the specified
- /// resolution level.
- ///
- /// This default implementation returns the value of the source.
- ///
- ///
- /// The resolution level, from 0 to L.
- ///
- ///
- /// The horizontal coordinate of the image origin in the canvas
- /// system, on the reference grid.
- ///
- ///
- public virtual int getImgULX(int rl)
- {
- return mressrc.getImgULX(rl);
- }
-
- /// Returns the vertical coordinate of the image origin, the top-left
- /// corner, in the canvas system, on the reference grid at the specified
- /// resolution level.
- ///
- /// This default implementation returns the value of the source.
- ///
- ///
- /// The resolution level, from 0 to L.
- ///
- ///
- /// The vertical coordinate of the image origin in the canvas
- /// system, on the reference grid.
- ///
- ///
- public virtual int getImgULY(int rl)
- {
- return mressrc.getImgULY(rl);
- }
-
- /// Returns the number of tiles in the horizontal and vertical directions.
- ///
- /// This default implementation returns the value of the source.
- ///
- ///
- /// If not null this object is used to return the information. If
- /// null a new one is created and returned.
- ///
- ///
- /// The number of tiles in the horizontal (Coord.x) and vertical
- /// (Coord.y) directions.
- ///
- ///
- public virtual Coord getNumTiles(Coord co)
- {
- return mressrc.getNumTiles(co);
- }
-
- /// Returns the total number of tiles in the image.
- ///
- /// This default implementation returns the value of the source.
- ///
- ///
- /// The total number of tiles in the image.
- ///
- ///
- public virtual int getNumTiles()
- {
- return mressrc.getNumTiles();
- }
- public abstract CSJ2K.j2k.wavelet.synthesis.SubbandSyn getSynSubbandTree(int param1, int param2);
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/wavelet/synthesis/SubbandSyn.cs b/CSJ2K/j2k/wavelet/synthesis/SubbandSyn.cs
deleted file mode 100644
index 20e7d64f..00000000
--- a/CSJ2K/j2k/wavelet/synthesis/SubbandSyn.cs
+++ /dev/null
@@ -1,310 +0,0 @@
-/*
-* CVS identifier:
-*
-* $Id: SubbandSyn.java,v 1.25 2001/07/26 08:54:59 grosbois Exp $
-*
-* Class: SubbandSyn
-*
-* Description: Element for a tree structure for a description
-* of subband for the synthesis side.
-*
-*
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-* */
-namespace CSJ2K.j2k.wavelet.synthesis
-{
-
- /// This class represents a subband in a tree structure that describes the
- /// subband decomposition for a wavelet transform, specifically for the
- /// syhthesis side.
- ///
- /// The element can be either a node or a leaf of the tree. If it is a node
- /// then ther are 4 descendants (LL, HL, LH and HH). If it is a leaf there are
- /// no descendants.
- ///
- /// The tree is bidirectional. Each element in the tree structure has a
- /// "parent", which is the subband from which the element was obtained by
- /// decomposition. The only exception is the root element which has no parent
- /// (i.e.it's null), for obvious reasons.
- ///
- ///
- public class SubbandSyn : Subband
- {
- /// Returns the parent of this subband. The parent of a subband is the
- /// subband from which this one was obtained by decomposition. The root
- /// element has no parent subband (null).
- ///
- ///
- /// The parent subband, or null for the root one.
- ///
- ///
- override public Subband Parent
- {
- get
- {
- return parent;
- }
-
- }
- /// Returns the LL child subband of this subband.
- ///
- ///
- /// The LL child subband, or null if there are no childs.
- ///
- ///
- override public Subband LL
- {
- get
- {
- return subb_LL;
- }
-
- }
- /// Returns the HL (horizontal high-pass) child subband of this subband.
- ///
- ///
- /// The HL child subband, or null if there are no childs.
- ///
- ///
- override public Subband HL
- {
- get
- {
- return subb_HL;
- }
-
- }
- /// Returns the LH (vertical high-pass) child subband of this subband.
- ///
- ///
- /// The LH child subband, or null if there are no childs.
- ///
- ///
- override public Subband LH
- {
- get
- {
- return subb_LH;
- }
-
- }
- /// Returns the HH child subband of this subband.
- ///
- ///
- /// The HH child subband, or null if there are no childs.
- ///
- ///
- override public Subband HH
- {
- get
- {
- return subb_HH;
- }
-
- }
- /// This function returns the horizontal wavelet filter relevant to this
- /// subband
- ///
- ///
- /// The horizontal wavelet filter
- ///
- ///
- override public WaveletFilter HorWFilter
- {
- get
- {
- return hFilter;
- }
-
- }
- /// This function returns the vertical wavelet filter relevant to this
- /// subband
- ///
- ///
- /// The vertical wavelet filter
- ///
- ///
- override public WaveletFilter VerWFilter
- {
- get
- {
- return hFilter;
- }
-
- }
-
- /// The reference to the parent of this subband. It is null for the root
- /// element. It is null by default.
- ///
- private SubbandSyn parent;
-
- /// The reference to the LL subband resulting from the decomposition of
- /// this subband. It is null by default.
- ///
- private SubbandSyn subb_LL;
-
- /// The reference to the HL subband (horizontal high-pass) resulting from
- /// the decomposition of this subband. It is null by default.
- ///
- private SubbandSyn subb_HL;
-
- /// The reference to the LH subband (vertical high-pass) resulting from
- /// the decomposition of this subband. It is null by default.
- ///
- ///
- private SubbandSyn subb_LH;
-
- /// The reference to the HH subband resulting from the decomposition of
- /// this subband. It is null by default.
- ///
- private SubbandSyn subb_HH;
-
- /// The horizontal analysis filter used to recompose this subband, from
- /// its childs. This is applicable to "node" elements only. The default
- /// value is null.
- ///
- public SynWTFilter hFilter;
-
- /// The vertical analysis filter used to decompose this subband, from its
- /// childs. This is applicable to "node" elements only. The default value
- /// is null.
- ///
- public SynWTFilter vFilter;
-
- /// The number of magnitude bits
- public int magbits = 0;
-
- /// Creates a SubbandSyn element with all the default values. The
- /// dimensions are (0,0) and the upper left corner is (0,0).
- ///
- ///
- public SubbandSyn()
- {
- }
-
- /// Creates the top-level node and the entire subband tree, with the
- /// top-level dimensions, the number of decompositions, and the
- /// decomposition tree as specified.
- ///
- /// This constructor just calls the same constructor of the super
- /// class.
- ///
- ///
- /// The top-level width
- ///
- ///
- /// The top-level height
- ///
- ///
- /// The horizontal coordinate of the upper-left corner with
- /// respect to the canvas origin, in the component grid.
- ///
- ///
- /// The vertical coordinate of the upper-left corner with
- /// respect to the canvas origin, in the component grid.
- ///
- ///
- /// The number of levels (or LL decompositions) in the tree.
- ///
- ///
- /// The horizontal wavelet synthesis filters for each
- /// resolution level, starting at resolution level 0.
- ///
- ///
- /// The vertical wavelet synthesis filters for each
- /// resolution level, starting at resolution level 0.
- ///
- ///
- ///
- /// WaveletFilter[],WaveletFilter[])
- ///
- ///
- public SubbandSyn(int w, int h, int ulcx, int ulcy, int lvls, WaveletFilter[] hfilters, WaveletFilter[] vfilters) : base(w, h, ulcx, ulcy, lvls, hfilters, vfilters)
- {
- }
-
- /// Splits the current subband in its four subbands. It changes the status
- /// of this element (from a leaf to a node, and sets the filters), creates
- /// the childs and initializes them. An IllegalArgumentException is thrown
- /// if this subband is not a leaf.
- ///
- /// It uses the initChilds() method to initialize the childs.
- ///
- ///
- /// The horizontal wavelet filter used to decompose this
- /// subband. It has to be a SynWTFilter object.
- ///
- ///
- /// The vertical wavelet filter used to decompose this
- /// subband. It has to be a SynWTFilter object.
- ///
- ///
- /// A reference to the LL leaf (subb_LL).
- ///
- ///
- ///
- ///
- ///
- protected internal override Subband split(WaveletFilter hfilter, WaveletFilter vfilter)
- {
- // Test that this is a node
- if (isNode)
- {
- throw new System.ArgumentException();
- }
-
- // Modify this element into a node and set the filters
- isNode = true;
- this.hFilter = (SynWTFilter)hfilter;
- this.vFilter = (SynWTFilter)vfilter;
-
- // Create childs
- subb_LL = new SubbandSyn();
- subb_LH = new SubbandSyn();
- subb_HL = new SubbandSyn();
- subb_HH = new SubbandSyn();
-
- // Assign parent
- subb_LL.parent = this;
- subb_HL.parent = this;
- subb_LH.parent = this;
- subb_HH.parent = this;
-
- // Initialize childs
- initChilds();
-
- // Return reference to LL subband
- return subb_LL;
- }
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/wavelet/synthesis/SynWTFilter.cs b/CSJ2K/j2k/wavelet/synthesis/SynWTFilter.cs
deleted file mode 100644
index 262b2187..00000000
--- a/CSJ2K/j2k/wavelet/synthesis/SynWTFilter.cs
+++ /dev/null
@@ -1,262 +0,0 @@
-/*
-* CVS identifier:
-*
-* $Id: SynWTFilter.java,v 1.9 2001/08/02 10:05:58 grosbois Exp $
-*
-* Class: SynWTFilter
-*
-* Description: The abstract class for all synthesis wavelet
-* filters.
-*
-*
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-* */
-namespace CSJ2K.j2k.wavelet.synthesis
-{
-
- /// This abstract class defines the methods of all synthesis wavelet
- /// filters. Specialized abstract classes that work on particular data types
- /// (int, float) provide more specific method calls while retaining the
- /// generality of this one. See the SynWTFilterInt and SynWTFilterFloat
- /// classes. Implementations of snythesis filters should inherit from one of
- /// those classes.
- ///
- /// The length of the output signal is always the sum of the length of the
- /// low-pass and high-pass input signals.
- ///
- /// All synthesis wavelet filters should follow the following conventions:
- ///
- ///
- ///
- /// - The first sample of the output corresponds to the low-pass one. As a
- /// consequence, if the output signal is of odd-length then the low-pass input
- /// signal is one sample longer than the high-pass input one. Therefore, if the
- /// length of output signal is N, the low-pass input signal is of length N/2 if
- /// N is even and N/2+1/2 if N is odd, while the high-pass input signal is of
- /// length N/2 if N is even and N/2-1/2 if N is odd.
- ///
- /// - The normalization of the analysis filters is 1 for the DC gain and 2
- /// for the Nyquist gain (Type I normalization), for both reversible and
- /// non-reversible filters. The normalization of the synthesis filters should
- /// ensure prefect reconstruction according to this normalization of the
- /// analysis wavelet filters.
- ///
- ///
- ///
- /// The synthetize method may seem very complicated, but is designed to
- /// minimize the amount of data copying and redundant calculations when used
- /// for block-based or line-based wavelet transform implementations, while
- /// being applicable to full-frame transforms as well.
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public abstract class SynWTFilter : WaveletFilter
- {
- public abstract int AnHighPosSupport { get; }
- public abstract int AnLowNegSupport { get; }
- public abstract int AnLowPosSupport { get; }
- public abstract bool Reversible { get; }
- public abstract int ImplType { get; }
- public abstract int SynHighNegSupport { get; }
- public abstract int SynHighPosSupport { get; }
- public abstract int AnHighNegSupport { get; }
- public abstract int DataType { get; }
- public abstract int SynLowNegSupport { get; }
- public abstract int SynLowPosSupport { get; }
-
- /// Reconstructs the output signal by the synthesis filter, recomposing the
- /// low-pass and high-pass input signals in one output signal. This method
- /// performs the upsampling and fitering with the low pass first filtering
- /// convention.
- ///
- /// The input low-pass (high-pass) signal resides in the lowSig
- /// array. The index of the first sample to filter (i.e. that will generate
- /// the first (second) output sample). is given by lowOff (highOff). This
- /// array must be of the same type as the one for which the particular
- /// implementation works with (which is returned by the getDataType()
- /// method).
- ///
- /// The low-pass (high-pass) input signal can be interleaved with other
- /// signals in the same lowSig (highSig) array, and this is determined by
- /// the lowStep (highStep) argument. This means that the first sample of
- /// the low-pass (high-pass) input signal is lowSig[lowOff]
- /// (highSig[highOff]), the second is lowSig[lowOff+lowStep]
- /// (highSig[highOff+highStep]), the third is lowSig[lowOff+2*lowStep]
- /// (highSig[highOff+2*highStep]), and so on. Therefore if lowStep
- /// (highStep) is 1 there is no interleaving. This feature allows to filter
- /// columns of a 2-D signal, when it is stored in a line by line order in
- /// lowSig (highSig), without having to copy the data, in this case the
- /// lowStep (highStep) argument should be the line width of the low-pass
- /// (high-pass) signal.
- ///
- /// The output signal is placed in the outSig array. The outOff and
- /// outStep arguments are analogous to the lowOff and lowStep ones, but
- /// they apply to the outSig array. The outSig array must be long enough to
- /// hold the low-pass output signal.
- ///
- ///
- /// This is the array that contains the low-pass input
- /// signal. It must be of the correct type (e.g., it must be int[] if
- /// getDataType() returns TYPE_INT).
- ///
- ///
- /// This is the index in lowSig of the first sample to
- /// filter.
- ///
- ///
- /// This is the number of samples in the low-pass input
- /// signal to filter.
- ///
- ///
- /// This is the step, or interleave factor, of the low-pass
- /// input signal samples in the lowSig array. See above.
- ///
- ///
- /// This is the array that contains the high-pass input
- /// signal. It must be of the correct type (e.g., it must be int[] if
- /// getDataType() returns TYPE_INT).
- ///
- ///
- /// This is the index in highSig of the first sample to
- /// filter.
- ///
- ///
- /// This is the number of samples in the high-pass input
- /// signal to filter.
- ///
- ///
- /// This is the step, or interleave factor, of the
- /// high-pass input signal samples in the highSig array. See above.
- ///
- ///
- /// This is the array where the output signal is placed. It
- /// must be of the same type as lowSig and it should be long enough to
- /// contain the output signal.
- ///
- ///
- /// This is the index in outSig of the element where to put
- /// the first output sample.
- ///
- ///
- /// This is the step, or interleave factor, of the output
- /// samples in the outSig array. See above.
- ///
- ///
- public abstract void synthetize_lpf(System.Object lowSig, int lowOff, int lowLen, int lowStep, System.Object highSig, int highOff, int highLen, int highStep, System.Object outSig, int outOff, int outStep);
-
- /// Reconstructs the output signal by the synthesis filter, recomposing the
- /// low-pass and high-pass input signals in one output signal. This method
- /// performs the upsampling and fitering with the high pass first filtering
- /// convention.
- ///
- /// The input low-pass (high-pass) signal resides in the lowSig
- /// array. The index of the first sample to filter (i.e. that will generate
- /// the first (second) output sample). is given by lowOff (highOff). This
- /// array must be of the same type as the one for which the particular
- /// implementation works with (which is returned by the getDataType()
- /// method).
- ///
- /// The low-pass (high-pass) input signal can be interleaved with other
- /// signals in the same lowSig (highSig) array, and this is determined by
- /// the lowStep (highStep) argument. This means that the first sample of
- /// the low-pass (high-pass) input signal is lowSig[lowOff]
- /// (highSig[highOff]), the second is lowSig[lowOff+lowStep]
- /// (highSig[highOff+highStep]), the third is lowSig[lowOff+2*lowStep]
- /// (highSig[highOff+2*highStep]), and so on. Therefore if lowStep
- /// (highStep) is 1 there is no interleaving. This feature allows to filter
- /// columns of a 2-D signal, when it is stored in a line by line order in
- /// lowSig (highSig), without having to copy the data, in this case the
- /// lowStep (highStep) argument should be the line width of the low-pass
- /// (high-pass) signal.
- ///
- /// The output signal is placed in the outSig array. The outOff and
- /// outStep arguments are analogous to the lowOff and lowStep ones, but
- /// they apply to the outSig array. The outSig array must be long enough to
- /// hold the low-pass output signal.
- ///
- ///
- /// This is the array that contains the low-pass input
- /// signal. It must be of the correct type (e.g., it must be int[] if
- /// getDataType() returns TYPE_INT).
- ///
- ///
- /// This is the index in lowSig of the first sample to
- /// filter.
- ///
- ///
- /// This is the number of samples in the low-pass input
- /// signal to filter.
- ///
- ///
- /// This is the step, or interleave factor, of the low-pass
- /// input signal samples in the lowSig array. See above.
- ///
- ///
- /// This is the array that contains the high-pass input
- /// signal. It must be of the correct type (e.g., it must be int[] if
- /// getDataType() returns TYPE_INT).
- ///
- ///
- /// This is the index in highSig of the first sample to
- /// filter.
- ///
- ///
- /// This is the number of samples in the high-pass input
- /// signal to filter.
- ///
- ///
- /// This is the step, or interleave factor, of the
- /// high-pass input signal samples in the highSig array. See above.
- ///
- ///
- /// This is the array where the output signal is placed. It
- /// must be of the same type as lowSig and it should be long enough to
- /// contain the output signal.
- ///
- ///
- /// This is the index in outSig of the element where to put
- /// the first output sample.
- ///
- ///
- /// This is the step, or interleave factor, of the output
- /// samples in the outSig array. See above.
- ///
- ///
- public abstract void synthetize_hpf(System.Object lowSig, int lowOff, int lowLen, int lowStep, System.Object highSig, int highOff, int highLen, int highStep, System.Object outSig, int outOff, int outStep);
- public abstract bool isSameAsFullWT(int param1, int param2, int param3);
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/wavelet/synthesis/SynWTFilterFloat.cs b/CSJ2K/j2k/wavelet/synthesis/SynWTFilterFloat.cs
deleted file mode 100644
index cedcf4fd..00000000
--- a/CSJ2K/j2k/wavelet/synthesis/SynWTFilterFloat.cs
+++ /dev/null
@@ -1,332 +0,0 @@
-/*
-* CVS identifier:
-*
-* $Id: SynWTFilterFloat.java,v 1.7 2000/09/05 09:26:32 grosbois Exp $
-*
-* Class: SynWTFilterFloat
-*
-* Description: A specialized synthesis wavelet filter interface
-* that works on float data.
-*
-*
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-*
-*
-*
-*/
-using CSJ2K.j2k.image;
-namespace CSJ2K.j2k.wavelet.synthesis
-{
-
- /// This extends the synthesis wavelet filter general definitions of
- /// SynWTFilter by adding methods that work for float data
- /// specifically. Implementations that work on float data should inherit
- /// from this class.
- ///
- /// See the SynWTFilter class for details such as
- /// normalization, how to split odd-length signals, etc.
- ///
- ///
The advantage of using the specialized method is that no casts
- /// are performed.
- ///
- ///
- ///
- ///
- ///
- public abstract class SynWTFilterFloat : SynWTFilter
- {
- /// Returns the type of data on which this filter works, as defined
- /// in the DataBlk interface, which is always TYPE_FLOAT for this
- /// class.
- ///
- ///
- /// The type of data as defined in the DataBlk interface.
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- override public int DataType
- {
- get
- {
- return DataBlk.TYPE_FLOAT;
- }
-
- }
-
- /// A specific version of the synthetize_lpf() method that works on float
- /// data. See the general description of the synthetize_lpf() method in the
- /// SynWTFilter class for more details.
- ///
- ///
- /// This is the array that contains the low-pass
- /// input signal.
- ///
- ///
- /// This is the index in lowSig of the first sample to
- /// filter.
- ///
- ///
- /// This is the number of samples in the low-pass
- /// input signal to filter.
- ///
- ///
- /// This is the step, or interleave factor, of the
- /// low-pass input signal samples in the lowSig array.
- ///
- ///
- /// This is the array that contains the high-pass
- /// input signal.
- ///
- ///
- /// This is the index in highSig of the first sample to
- /// filter.
- ///
- ///
- /// This is the number of samples in the high-pass
- /// input signal to filter.
- ///
- ///
- /// This is the step, or interleave factor, of the
- /// high-pass input signal samples in the highSig array.
- ///
- ///
- /// This is the array where the output signal is
- /// placed. It should be long enough to contain the output signal.
- ///
- ///
- /// This is the index in outSig of the element where
- /// to put the first output sample.
- ///
- ///
- /// This is the step, or interleave factor, of the
- /// output samples in the outSig array.
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public abstract void synthetize_lpf(float[] lowSig, int lowOff, int lowLen, int lowStep, float[] highSig, int highOff, int highLen, int highStep, float[] outSig, int outOff, int outStep);
-
- /// The general version of the synthetize_lpf() method, it just calls
- /// the specialized version. See the description of the synthetize_lpf()
- /// method of the SynWTFilter class for more details.
- ///
- ///
- /// This is the array that contains the low-pass
- /// input signal. It must be an float[].
- ///
- ///
- /// This is the index in lowSig of the first sample to
- /// filter.
- ///
- ///
- /// This is the number of samples in the low-pass
- /// input signal to filter.
- ///
- ///
- /// This is the step, or interleave factor, of the
- /// low-pass input signal samples in the lowSig array.
- ///
- ///
- /// This is the array that contains the high-pass
- /// input signal. It must be an float[].
- ///
- ///
- /// This is the index in highSig of the first sample to
- /// filter.
- ///
- ///
- /// This is the number of samples in the high-pass
- /// input signal to filter.
- ///
- ///
- /// This is the step, or interleave factor, of the
- /// high-pass input signal samples in the highSig array.
- ///
- ///
- /// This is the array where the output signal is
- /// placed. It should be and float[] and long enough to contain the
- /// output signal.
- ///
- ///
- /// This is the index in outSig of the element where
- /// to put the first output sample.
- ///
- ///
- /// This is the step, or interleave factor, of the
- /// output samples in the outSig array.
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public override void synthetize_lpf(System.Object lowSig, int lowOff, int lowLen, int lowStep, System.Object highSig, int highOff, int highLen, int highStep, System.Object outSig, int outOff, int outStep)
- {
-
- synthetize_lpf((float[])lowSig, lowOff, lowLen, lowStep, (float[])highSig, highOff, highLen, highStep, (float[])outSig, outOff, outStep);
- }
-
- /// A specific version of the synthetize_hpf() method that works on float
- /// data. See the general description of the synthetize_hpf() method in the
- /// SynWTFilter class for more details.
- ///
- ///
- /// This is the array that contains the low-pass
- /// input signal.
- ///
- ///
- /// This is the index in lowSig of the first sample to
- /// filter.
- ///
- ///
- /// This is the number of samples in the low-pass
- /// input signal to filter.
- ///
- ///
- /// This is the step, or interleave factor, of the
- /// low-pass input signal samples in the lowSig array.
- ///
- ///
- /// This is the array that contains the high-pass
- /// input signal.
- ///
- ///
- /// This is the index in highSig of the first sample to
- /// filter.
- ///
- ///
- /// This is the number of samples in the high-pass
- /// input signal to filter.
- ///
- ///
- /// This is the step, or interleave factor, of the
- /// high-pass input signal samples in the highSig array.
- ///
- ///
- /// This is the array where the output signal is
- /// placed. It should be long enough to contain the output signal.
- ///
- ///
- /// This is the index in outSig of the element where
- /// to put the first output sample.
- ///
- ///
- /// This is the step, or interleave factor, of the
- /// output samples in the outSig array.
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public abstract void synthetize_hpf(float[] lowSig, int lowOff, int lowLen, int lowStep, float[] highSig, int highOff, int highLen, int highStep, float[] outSig, int outOff, int outStep);
-
- /// The general version of the synthetize_hpf() method, it just calls
- /// the specialized version. See the description of the synthetize_hpf()
- /// method of the SynWTFilter class for more details.
- ///
- ///
- /// This is the array that contains the low-pass
- /// input signal. It must be an float[].
- ///
- ///
- /// This is the index in lowSig of the first sample to
- /// filter.
- ///
- ///
- /// This is the number of samples in the low-pass
- /// input signal to filter.
- ///
- ///
- /// This is the step, or interleave factor, of the
- /// low-pass input signal samples in the lowSig array.
- ///
- ///
- /// This is the array that contains the high-pass
- /// input signal. It must be an float[].
- ///
- ///
- /// This is the index in highSig of the first sample to
- /// filter.
- ///
- ///
- /// This is the number of samples in the high-pass
- /// input signal to filter.
- ///
- ///
- /// This is the step, or interleave factor, of the
- /// high-pass input signal samples in the highSig array.
- ///
- ///
- /// This is the array where the output signal is
- /// placed. It should be and float[] and long enough to contain the
- /// output signal.
- ///
- ///
- /// This is the index in outSig of the element where
- /// to put the first output sample.
- ///
- ///
- /// This is the step, or interleave factor, of the
- /// output samples in the outSig array.
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public override void synthetize_hpf(System.Object lowSig, int lowOff, int lowLen, int lowStep, System.Object highSig, int highOff, int highLen, int highStep, System.Object outSig, int outOff, int outStep)
- {
-
- synthetize_hpf((float[])lowSig, lowOff, lowLen, lowStep, (float[])highSig, highOff, highLen, highStep, (float[])outSig, outOff, outStep);
- }
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/wavelet/synthesis/SynWTFilterFloatLift9x7.cs b/CSJ2K/j2k/wavelet/synthesis/SynWTFilterFloatLift9x7.cs
deleted file mode 100644
index 7adf53b8..00000000
--- a/CSJ2K/j2k/wavelet/synthesis/SynWTFilterFloatLift9x7.cs
+++ /dev/null
@@ -1,691 +0,0 @@
-/*
-* CVS identifier:
-*
-* $Id: SynWTFilterFloatLift9x7.java,v 1.15 2002/05/22 15:01:56 grosbois Exp $
-*
-* Class: SynWTFilterFloatLift9x7
-*
-* Description: A synthetizing wavelet filter implementing the
-* lifting 9x7 transform.
-*
-*
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-* */
-namespace CSJ2K.j2k.wavelet.synthesis
-{
-
- /// This class inherits from the synthesis wavelet filter definition for int
- /// data. It implements the inverse wavelet transform specifically for the 9x7
- /// filter. The implementation is based on the lifting scheme.
- ///
- /// See the SynWTFilter class for details such as normalization, how to
- /// split odd-length signals, etc. In particular, this method assumes that the
- /// low-pass coefficient is computed first.
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public class SynWTFilterFloatLift9x7 : SynWTFilterFloat
- {
- /// Returns the negative support of the low-pass analysis filter. That is
- /// the number of taps of the filter in the negative direction.
- ///
- ///
- /// 2
- ///
- ///
- override public int AnLowNegSupport
- {
- get
- {
- return 4;
- }
-
- }
- /// Returns the positive support of the low-pass analysis filter. That is
- /// the number of taps of the filter in the negative direction.
- ///
- ///
- /// The number of taps of the low-pass analysis filter in the
- /// positive direction
- ///
- ///
- override public int AnLowPosSupport
- {
- get
- {
- return 4;
- }
-
- }
- /// Returns the negative support of the high-pass analysis filter. That is
- /// the number of taps of the filter in the negative direction.
- ///
- ///
- /// The number of taps of the high-pass analysis filter in
- /// the negative direction
- ///
- ///
- override public int AnHighNegSupport
- {
- get
- {
- return 3;
- }
-
- }
- /// Returns the positive support of the high-pass analysis filter. That is
- /// the number of taps of the filter in the negative direction.
- ///
- ///
- /// The number of taps of the high-pass analysis filter in the
- /// positive direction
- ///
- ///
- override public int AnHighPosSupport
- {
- get
- {
- return 3;
- }
-
- }
- /// Returns the negative support of the low-pass synthesis filter. That is
- /// the number of taps of the filter in the negative direction.
- ///
- /// A MORE PRECISE DEFINITION IS NEEDED
- ///
- ///
- /// The number of taps of the low-pass synthesis filter in the
- /// negative direction
- ///
- ///
- override public int SynLowNegSupport
- {
- get
- {
- return 3;
- }
-
- }
- /// Returns the positive support of the low-pass synthesis filter. That is
- /// the number of taps of the filter in the negative direction.
- ///
- /// A MORE PRECISE DEFINITION IS NEEDED
- ///
- ///
- /// The number of taps of the low-pass synthesis filter in the
- /// positive direction
- ///
- ///
- override public int SynLowPosSupport
- {
- get
- {
- return 3;
- }
-
- }
- /// Returns the negative support of the high-pass synthesis filter. That is
- /// the number of taps of the filter in the negative direction.
- ///
- /// A MORE PRECISE DEFINITION IS NEEDED
- ///
- ///
- /// The number of taps of the high-pass synthesis filter in the
- /// negative direction
- ///
- ///
- override public int SynHighNegSupport
- {
- get
- {
- return 4;
- }
-
- }
- /// Returns the positive support of the high-pass synthesis filter. That is
- /// the number of taps of the filter in the negative direction.
- ///
- /// A MORE PRECISE DEFINITION IS NEEDED
- ///
- ///
- /// The number of taps of the high-pass synthesis filter in the
- /// positive direction
- ///
- ///
- override public int SynHighPosSupport
- {
- get
- {
- return 4;
- }
-
- }
- /// Returns the implementation type of this filter, as defined in this
- /// class, such as WT_FILTER_INT_LIFT, WT_FILTER_FLOAT_LIFT,
- /// WT_FILTER_FLOAT_CONVOL.
- ///
- ///
- /// WT_FILTER_INT_LIFT.
- ///
- ///
- override public int ImplType
- {
- get
- {
- return CSJ2K.j2k.wavelet.WaveletFilter_Fields.WT_FILTER_FLOAT_LIFT;
- }
-
- }
- /// Returns the reversibility of the filter. A filter is considered
- /// reversible if it is suitable for lossless coding.
- ///
- ///
- /// true since the 9x7 is reversible, provided the appropriate
- /// rounding is performed.
- ///
- ///
- override public bool Reversible
- {
- get
- {
- return false;
- }
-
- }
-
- /// The value of the first lifting step coefficient
- public const float ALPHA = -1.586134342f;
-
- /// The value of the second lifting step coefficient
- public const float BETA = -0.05298011854f;
-
- /// The value of the third lifting step coefficient
- public const float GAMMA = 0.8829110762f;
-
- /// The value of the fourth lifting step coefficient
- public const float DELTA = 0.4435068522f;
-
- /// The value of the low-pass subband normalization factor
- public const float KL = 0.8128930655f;
-
- /// The value of the high-pass subband normalization factor
- public const float KH = 1.230174106f;
-
- /// An implementation of the synthetize_lpf() method that works on int
- /// data, for the inverse 9x7 wavelet transform using the lifting
- /// scheme. See the general description of the synthetize_lpf() method in
- /// the SynWTFilter class for more details.
- ///
- /// The low-pass and high-pass subbands are normalized by respectively a
- /// factor of 1/KL and a factor of 1/KH
- ///
- ///
The coefficients of the first lifting step are [-DELTA 1 -DELTA].
- ///
- ///
The coefficients of the second lifting step are [-GAMMA 1 -GAMMA].
- ///
- ///
The coefficients of the third lifting step are [-BETA 1 -BETA].
- ///
- ///
The coefficients of the fourth lifting step are [-ALPHA 1 -ALPHA].
- ///
- ///
- /// This is the array that contains the low-pass input
- /// signal.
- ///
- ///
- /// This is the index in lowSig of the first sample to
- /// filter.
- ///
- ///
- /// This is the number of samples in the low-pass input
- /// signal to filter.
- ///
- ///
- /// This is the step, or interleave factor, of the low-pass
- /// input signal samples in the lowSig array.
- ///
- ///
- /// This is the array that contains the high-pass input
- /// signal.
- ///
- ///
- /// This is the index in highSig of the first sample to
- /// filter.
- ///
- ///
- /// This is the number of samples in the high-pass input
- /// signal to filter.
- ///
- ///
- /// This is the step, or interleave factor, of the
- /// high-pass input signal samples in the highSig array.
- ///
- ///
- /// This is the array where the output signal is placed. It
- /// should be long enough to contain the output signal.
- ///
- ///
- /// This is the index in outSig of the element where to put
- /// the first output sample.
- ///
- ///
- /// This is the step, or interleave factor, of the output
- /// samples in the outSig array.
- ///
- ///
- ///
- ///
- ///
- public override void synthetize_lpf(float[] lowSig, int lowOff, int lowLen, int lowStep, float[] highSig, int highOff, int highLen, int highStep, float[] outSig, int outOff, int outStep)
- {
-
- int i;
- int outLen = lowLen + highLen; //Length of the output signal
- int iStep = 2 * outStep; //Upsampling in outSig
- int ik; //Indexing outSig
- int lk; //Indexing lowSig
- int hk; //Indexing highSig
-
- // Generate intermediate low frequency subband
- //float sample = 0;
-
- //Initialize counters
- lk = lowOff;
- hk = highOff;
- ik = outOff;
-
- //Handle tail boundary effect. Use symmetric extension
- if (outLen > 1)
- {
- outSig[ik] = lowSig[lk] / KL - 2 * DELTA * highSig[hk] / KH;
- }
- else
- {
- outSig[ik] = lowSig[lk];
- }
-
- lk += lowStep;
- hk += highStep;
- ik += iStep;
-
- //Apply lifting step to each "inner" sample
- for (i = 2; i < outLen - 1; i += 2, ik += iStep, lk += lowStep, hk += highStep)
- {
- outSig[ik] = lowSig[lk] / KL - DELTA * (highSig[hk - highStep] + highSig[hk]) / KH;
- }
-
- //Handle head boundary effect if input signal has odd length
- if (outLen % 2 == 1)
- {
- if (outLen > 2)
- {
- outSig[ik] = lowSig[lk] / KL - 2 * DELTA * highSig[hk - highStep] / KH;
- }
- }
-
- // Generate intermediate high frequency subband
-
- //Initialize counters
- lk = lowOff;
- hk = highOff;
- ik = outOff + outStep;
-
- //Apply lifting step to each "inner" sample
- for (i = 1; i < outLen - 1; i += 2, ik += iStep, hk += highStep, lk += lowStep)
- {
- outSig[ik] = highSig[hk] / KH - GAMMA * (outSig[ik - outStep] + outSig[ik + outStep]);
- }
-
- //Handle head boundary effect if output signal has even length
- if (outLen % 2 == 0)
- {
- outSig[ik] = highSig[hk] / KH - 2 * GAMMA * outSig[ik - outStep];
- }
-
- // Generate even samples (inverse low-pass filter)
-
- //Initialize counters
- ik = outOff;
-
- //Handle tail boundary effect
- //If access the overlap then perform the lifting step.
- if (outLen > 1)
- {
- outSig[ik] -= 2 * BETA * outSig[ik + outStep];
- }
- ik += iStep;
-
- //Apply lifting step to each "inner" sample
- for (i = 2; i < outLen - 1; i += 2, ik += iStep)
- {
- outSig[ik] -= BETA * (outSig[ik - outStep] + outSig[ik + outStep]);
- }
-
- //Handle head boundary effect if input signal has odd length
- if (outLen % 2 == 1 && outLen > 2)
- {
- outSig[ik] -= 2 * BETA * outSig[ik - outStep];
- }
-
- // Generate odd samples (inverse high pass-filter)
-
- //Initialize counters
- ik = outOff + outStep;
-
- //Apply first lifting step to each "inner" sample
- for (i = 1; i < outLen - 1; i += 2, ik += iStep)
- {
- outSig[ik] -= ALPHA * (outSig[ik - outStep] + outSig[ik + outStep]);
- }
-
- //Handle head boundary effect if input signal has even length
- if (outLen % 2 == 0)
- {
- outSig[ik] -= 2 * ALPHA * outSig[ik - outStep];
- }
- }
-
- /// An implementation of the synthetize_hpf() method that works on int
- /// data, for the inverse 9x7 wavelet transform using the lifting
- /// scheme. See the general description of the synthetize_hpf() method in
- /// the SynWTFilter class for more details.
- ///
- /// The low-pass and high-pass subbands are normalized by respectively
- /// a factor of 1/KL and a factor of 1/KH
- ///
- ///
The coefficients of the first lifting step are [-DELTA 1 -DELTA].
- ///
- ///
The coefficients of the second lifting step are [-GAMMA 1 -GAMMA].
- ///
- ///
The coefficients of the third lifting step are [-BETA 1 -BETA].
- ///
- ///
The coefficients of the fourth lifting step are [-ALPHA 1 -ALPHA].
- ///
- ///
- /// This is the array that contains the low-pass
- /// input signal.
- ///
- ///
- /// This is the index in lowSig of the first sample to
- /// filter.
- ///
- ///
- /// This is the number of samples in the low-pass input
- /// signal to filter.
- ///
- ///
- /// This is the step, or interleave factor, of the low-pass
- /// input signal samples in the lowSig array.
- ///
- ///
- /// This is the array that contains the high-pass input
- /// signal.
- ///
- ///
- /// This is the index in highSig of the first sample to
- /// filter.
- ///
- ///
- /// This is the number of samples in the high-pass input
- /// signal to filter.
- ///
- ///
- /// This is the step, or interleave factor, of the
- /// high-pass input signal samples in the highSig array.
- ///
- ///
- /// This is the array where the output signal is placed. It
- /// should be long enough to contain the output signal.
- ///
- ///
- /// This is the index in outSig of the element where to put
- /// the first output sample.
- ///
- ///
- /// This is the step, or interleave factor, of the output
- /// samples in the outSig array.
- ///
- ///
- ///
- ///
- ///
- public override void synthetize_hpf(float[] lowSig, int lowOff, int lowLen, int lowStep, float[] highSig, int highOff, int highLen, int highStep, float[] outSig, int outOff, int outStep)
- {
-
- int i;
- int outLen = lowLen + highLen; //Length of the output signal
- int iStep = 2 * outStep; //Upsampling in outSig
- int ik; //Indexing outSig
- int lk; //Indexing lowSig
- int hk; //Indexing highSig
-
- // Initialize counters
- lk = lowOff;
- hk = highOff;
-
- if (outLen != 1)
- {
- int outLen2 = outLen >> 1;
- // "Inverse normalize" each sample
- for (i = 0; i < outLen2; i++)
- {
- lowSig[lk] /= KL;
- highSig[hk] /= KH;
- lk += lowStep;
- hk += highStep;
- }
- // "Inverse normalise" last high pass coefficient
- if (outLen % 2 == 1)
- {
- highSig[hk] /= KH;
- }
- }
- else
- {
- // Normalize for Nyquist gain
- highSig[highOff] /= 2;
- }
-
- // Generate intermediate low frequency subband
-
- //Initialize counters
- lk = lowOff;
- hk = highOff;
- ik = outOff + outStep;
-
- //Apply lifting step to each "inner" sample
- for (i = 1; i < outLen - 1; i += 2)
- {
- outSig[ik] = lowSig[lk] - DELTA * (highSig[hk] + highSig[hk + highStep]);
- ik += iStep;
- lk += lowStep;
- hk += highStep;
- }
-
- if (outLen % 2 == 0 && outLen > 1)
- {
- //Use symmetric extension
- outSig[ik] = lowSig[lk] - 2 * DELTA * highSig[hk];
- }
-
- // Generate intermediate high frequency subband
-
- //Initialize counters
- hk = highOff;
- ik = outOff;
-
- if (outLen > 1)
- {
- outSig[ik] = highSig[hk] - 2 * GAMMA * outSig[ik + outStep];
- }
- else
- {
- outSig[ik] = highSig[hk];
- }
-
- ik += iStep;
- hk += highStep;
-
- //Apply lifting step to each "inner" sample
- for (i = 2; i < outLen - 1; i += 2)
- {
- outSig[ik] = highSig[hk] - GAMMA * (outSig[ik - outStep] + outSig[ik + outStep]);
- ik += iStep;
- hk += highStep;
- }
-
- //Handle head boundary effect if output signal has even length
- if (outLen % 2 == 1 && outLen > 1)
- {
- //Use symmetric extension
- outSig[ik] = highSig[hk] - 2 * GAMMA * outSig[ik - outStep];
- }
-
- // Generate even samples (inverse low-pass filter)
-
- //Initialize counters
- ik = outOff + outStep;
-
- //Apply lifting step to each "inner" sample
- for (i = 1; i < outLen - 1; i += 2)
- {
- outSig[ik] -= BETA * (outSig[ik - outStep] + outSig[ik + outStep]);
- ik += iStep;
- }
-
- if (outLen % 2 == 0 && outLen > 1)
- {
- // symmetric extension.
- outSig[ik] -= 2 * BETA * outSig[ik - outStep];
- }
-
- // Generate odd samples (inverse high pass-filter)
-
- //Initialize counters
- ik = outOff;
-
- if (outLen > 1)
- {
- // symmetric extension.
- outSig[ik] -= 2 * ALPHA * outSig[ik + outStep];
- }
- ik += iStep;
-
- //Apply first lifting step to each "inner" sample
- for (i = 2; i < outLen - 1; i += 2)
- {
- outSig[ik] -= ALPHA * (outSig[ik - outStep] + outSig[ik + outStep]);
- ik += iStep;
- }
-
- //Handle head boundary effect if input signal has even length
- if ((outLen % 2 == 1) && (outLen > 1))
- {
- //Use symmetric extension
- outSig[ik] -= 2 * ALPHA * outSig[ik - outStep];
- }
- }
-
- /// Returns true if the wavelet filter computes or uses the
- /// same "inner" subband coefficient as the full frame wavelet transform,
- /// and false otherwise. In particular, for block based transforms with
- /// reduced overlap, this method should return false. The term "inner"
- /// indicates that this applies only with respect to the coefficient that
- /// are not affected by image boundaries processings such as symmetric
- /// extension, since there is not reference method for this.
- ///
- /// The result depends on the length of the allowed overlap when
- /// compared to the overlap required by the wavelet filter. It also
- /// depends on how overlap processing is implemented in the wavelet
- /// filter.
- ///
- ///
- /// This is the number of samples in the input
- /// signal before the first sample to filter that can be used for
- /// overlap.
- ///
- ///
- /// This is the number of samples in the input
- /// signal after the last sample to filter that can be used for
- /// overlap.
- ///
- ///
- /// This is the lenght of the input signal to filter.The
- /// required number of samples in the input signal after the last sample
- /// depends on the length of the input signal.
- ///
- ///
- /// true if both overlaps are greater than 2, and correct
- /// processing is applied in the analyze() method.
- ///
- ///
- ///
- ///
- public override bool isSameAsFullWT(int tailOvrlp, int headOvrlp, int inLen)
- {
-
- //If the input signal has even length.
- if (inLen % 2 == 0)
- {
- if (tailOvrlp >= 2 && headOvrlp >= 1)
- return true;
- else
- return false;
- }
- //Else if the input signal has odd length.
- else
- {
- if (tailOvrlp >= 2 && headOvrlp >= 2)
- return true;
- else
- return false;
- }
- }
-
- /// Returns a string of information about the synthesis wavelet filter
- ///
- ///
- /// wavelet filter type.
- ///
- ///
- ///
- public override System.String ToString()
- {
- return "w9x7 (lifting)";
- }
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/wavelet/synthesis/SynWTFilterInt.cs b/CSJ2K/j2k/wavelet/synthesis/SynWTFilterInt.cs
deleted file mode 100644
index 7dbd24d0..00000000
--- a/CSJ2K/j2k/wavelet/synthesis/SynWTFilterInt.cs
+++ /dev/null
@@ -1,334 +0,0 @@
-/*
-* CVS identifier:
-*
-* $Id: SynWTFilterInt.java,v 1.7 2000/09/05 09:26:35 grosbois Exp $
-*
-* Class: SynWTFilterInt
-*
-* Description: A specialized synthesis wavelet filter interface
-* that works on int data.
-*
-*
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-*
-*
-*
-*/
-using CSJ2K.j2k.image;
-namespace CSJ2K.j2k.wavelet.synthesis
-{
-
- /// This extends the synthesis wavelet filter general definitions of
- /// SynWTFilter by adding methods that work for int data
- /// specifically. Implementations that work on int data should inherit
- /// from this class.
- ///
- /// See the SynWTFilter class for details such as
- /// normalization, how to split odd-length signals, etc.
- ///
- ///
The advantage of using the specialized method is that no casts
- /// are performed.
- ///
- ///
- ///
- ///
- ///
- public abstract class SynWTFilterInt : SynWTFilter
- {
- /// Returns the type of data on which this filter works, as defined
- /// in the DataBlk interface, which is always TYPE_INT for this
- /// class.
- ///
- ///
- /// The type of data as defined in the DataBlk interface.
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- override public int DataType
- {
- get
- {
- return DataBlk.TYPE_INT;
- }
-
- }
-
- /// A specific version of the synthetize_lpf() method that works on int
- /// data. See the general description of the synthetize_lpf() method in the
- /// SynWTFilter class for more details.
- ///
- ///
- /// This is the array that contains the low-pass
- /// input signal.
- ///
- ///
- /// This is the index in lowSig of the first sample to
- /// filter.
- ///
- ///
- /// This is the number of samples in the low-pass
- /// input signal to filter.
- ///
- ///
- /// This is the step, or interleave factor, of the
- /// low-pass input signal samples in the lowSig array.
- ///
- ///
- /// This is the array that contains the high-pass
- /// input signal.
- ///
- ///
- /// This is the index in highSig of the first sample to
- /// filter.
- ///
- ///
- /// This is the number of samples in the high-pass
- /// input signal to filter.
- ///
- ///
- /// This is the step, or interleave factor, of the
- /// high-pass input signal samples in the highSig array.
- ///
- ///
- /// This is the array where the output signal is
- /// placed. It should be long enough to contain the output signal.
- ///
- ///
- /// This is the index in outSig of the element where
- /// to put the first output sample.
- ///
- ///
- /// This is the step, or interleave factor, of the
- /// output samples in the outSig array.
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public abstract void synthetize_lpf(int[] lowSig, int lowOff, int lowLen, int lowStep, int[] highSig, int highOff, int highLen, int highStep, int[] outSig, int outOff, int outStep);
-
- /// The general version of the synthetize_lpf() method, it just calls
- /// the specialized version. See the description of the synthetize_lpf()
- /// method of the SynWTFilter class for more details.
- ///
- ///
- /// This is the array that contains the low-pass
- /// input signal. It must be an int[].
- ///
- ///
- /// This is the index in lowSig of the first sample to
- /// filter.
- ///
- ///
- /// This is the number of samples in the low-pass
- /// input signal to filter.
- ///
- ///
- /// This is the step, or interleave factor, of the
- /// low-pass input signal samples in the lowSig array.
- ///
- ///
- /// This is the array that contains the high-pass
- /// input signal. Itmust be an int[].
- ///
- ///
- /// This is the index in highSig of the first sample to
- /// filter.
- ///
- ///
- /// This is the number of samples in the high-pass
- /// input signal to filter.
- ///
- ///
- /// This is the step, or interleave factor, of the
- /// high-pass input signal samples in the highSig array.
- ///
- ///
- /// This is the array where the output signal is
- /// placed. It should be and int[] and long enough to contain the
- /// output signal.
- ///
- ///
- /// This is the index in outSig of the element where
- /// to put the first output sample.
- ///
- ///
- /// This is the step, or interleave factor, of the
- /// output samples in the outSig array.
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public override void synthetize_lpf(System.Object lowSig, int lowOff, int lowLen, int lowStep, System.Object highSig, int highOff, int highLen, int highStep, System.Object outSig, int outOff, int outStep)
- {
-
- synthetize_lpf((int[])lowSig, lowOff, lowLen, lowStep, (int[])highSig, highOff, highLen, highStep, (int[])outSig, outOff, outStep);
- }
-
- /// A specific version of the synthetize_hpf() method that works on int
- /// data. See the general description of the synthetize_hpf() method in the
- /// SynWTFilter class for more details.
- ///
- ///
- /// This is the array that contains the low-pass
- /// input signal.
- ///
- ///
- /// This is the index in lowSig of the first sample to
- /// filter.
- ///
- ///
- /// This is the number of samples in the low-pass
- /// input signal to filter.
- ///
- ///
- /// This is the step, or interleave factor, of the
- /// low-pass input signal samples in the lowSig array.
- ///
- ///
- /// This is the array that contains the high-pass
- /// input signal.
- ///
- ///
- /// This is the index in highSig of the first sample to
- /// filter.
- ///
- ///
- /// This is the number of samples in the high-pass
- /// input signal to filter.
- ///
- ///
- /// This is the step, or interleave factor, of the
- /// high-pass input signal samples in the highSig array.
- ///
- ///
- /// This is the array where the output signal is
- /// placed. It should be long enough to contain the output signal.
- ///
- ///
- /// This is the index in outSig of the element where
- /// to put the first output sample.
- ///
- ///
- /// This is the step, or interleave factor, of the
- /// output samples in the outSig array.
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public abstract void synthetize_hpf(int[] lowSig, int lowOff, int lowLen, int lowStep, int[] highSig, int highOff, int highLen, int highStep, int[] outSig, int outOff, int outStep);
-
-
-
- /// The general version of the synthetize_hpf() method, it just calls
- /// the specialized version. See the description of the synthetize_hpf()
- /// method of the SynWTFilter class for more details.
- ///
- ///
- /// This is the array that contains the low-pass
- /// input signal. It must be an int[].
- ///
- ///
- /// This is the index in lowSig of the first sample to
- /// filter.
- ///
- ///
- /// This is the number of samples in the low-pass
- /// input signal to filter.
- ///
- ///
- /// This is the step, or interleave factor, of the
- /// low-pass input signal samples in the lowSig array.
- ///
- ///
- /// This is the array that contains the high-pass
- /// input signal. Itmust be an int[].
- ///
- ///
- /// This is the index in highSig of the first sample to
- /// filter.
- ///
- ///
- /// This is the number of samples in the high-pass
- /// input signal to filter.
- ///
- ///
- /// This is the step, or interleave factor, of the
- /// high-pass input signal samples in the highSig array.
- ///
- ///
- /// This is the array where the output signal is
- /// placed. It should be and int[] and long enough to contain the
- /// output signal.
- ///
- ///
- /// This is the index in outSig of the element where
- /// to put the first output sample.
- ///
- ///
- /// This is the step, or interleave factor, of the
- /// output samples in the outSig array.
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public override void synthetize_hpf(System.Object lowSig, int lowOff, int lowLen, int lowStep, System.Object highSig, int highOff, int highLen, int highStep, System.Object outSig, int outOff, int outStep)
- {
-
- synthetize_hpf((int[])lowSig, lowOff, lowLen, lowStep, (int[])highSig, highOff, highLen, highStep, (int[])outSig, outOff, outStep);
- }
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/wavelet/synthesis/SynWTFilterIntLift5x3.cs b/CSJ2K/j2k/wavelet/synthesis/SynWTFilterIntLift5x3.cs
deleted file mode 100644
index 93381d0c..00000000
--- a/CSJ2K/j2k/wavelet/synthesis/SynWTFilterIntLift5x3.cs
+++ /dev/null
@@ -1,538 +0,0 @@
-/*
-* CVS identifier:
-*
-* $Id: SynWTFilterIntLift5x3.java,v 1.11 2001/08/02 11:24:23 grosbois Exp $
-*
-* Class: SynWTFilterIntLift5x3
-*
-* Description: A synthetizing wavelet filter implementing the
-* lifting 5x3 transform.
-*
-*
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-* */
-namespace CSJ2K.j2k.wavelet.synthesis
-{
-
- /// This class inherits from the synthesis wavelet filter definition for int
- /// data. It implements the inverse wavelet transform specifically for the 5x3
- /// filter. The implementation is based on the lifting scheme.
- ///
- /// See the SynWTFilter class for details such as normalization, how to
- /// split odd-length signals, etc. In particular, this method assumes that the
- /// low-pass coefficient is computed first.
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public class SynWTFilterIntLift5x3 : SynWTFilterInt
- {
- /// Returns the negative support of the low-pass analysis filter. That is
- /// the number of taps of the filter in the negative direction.
- ///
- ///
- /// 2
- ///
- ///
- override public int AnLowNegSupport
- {
- get
- {
- return 2;
- }
-
- }
- /// Returns the positive support of the low-pass analysis filter. That is
- /// the number of taps of the filter in the negative direction.
- ///
- ///
- /// The number of taps of the low-pass analysis filter in the
- /// positive direction
- ///
- ///
- override public int AnLowPosSupport
- {
- get
- {
- return 2;
- }
-
- }
- /// Returns the negative support of the high-pass analysis filter. That is
- /// the number of taps of the filter in the negative direction.
- ///
- ///
- /// The number of taps of the high-pass analysis filter in the
- /// negative direction
- ///
- ///
- override public int AnHighNegSupport
- {
- get
- {
- return 1;
- }
-
- }
- /// Returns the positive support of the high-pass analysis filter. That is
- /// the number of taps of the filter in the negative direction.
- ///
- ///
- /// The number of taps of the high-pass analysis filter in the
- /// positive direction
- ///
- ///
- override public int AnHighPosSupport
- {
- get
- {
- return 1;
- }
-
- }
- /// Returns the negative support of the low-pass synthesis filter. That is
- /// the number of taps of the filter in the negative direction.
- ///
- ///
- /// The number of taps of the low-pass synthesis filter in the
- /// negative direction
- ///
- ///
- override public int SynLowNegSupport
- {
- get
- {
- return 1;
- }
-
- }
- /// Returns the positive support of the low-pass synthesis filter. That is
- /// the number of taps of the filter in the negative direction.
- ///
- ///
- /// The number of taps of the low-pass synthesis filter in the
- /// positive direction
- ///
- ///
- override public int SynLowPosSupport
- {
- get
- {
- return 1;
- }
-
- }
- /// Returns the negative support of the high-pass synthesis filter. That is
- /// the number of taps of the filter in the negative direction.
- ///
- ///
- /// The number of taps of the high-pass synthesis filter in the
- /// negative direction
- ///
- ///
- override public int SynHighNegSupport
- {
- get
- {
- return 2;
- }
-
- }
- /// Returns the positive support of the high-pass synthesis filter. That is
- /// the number of taps of the filter in the negative direction.
- ///
- ///
- /// The number of taps of the high-pass synthesis filter in the
- /// positive direction
- ///
- ///
- override public int SynHighPosSupport
- {
- get
- {
- return 2;
- }
-
- }
- /// Returns the implementation type of this filter, as defined in this
- /// class, such as WT_FILTER_INT_LIFT, WT_FILTER_FLOAT_LIFT,
- /// WT_FILTER_FLOAT_CONVOL.
- ///
- ///
- /// WT_FILTER_INT_LIFT.
- ///
- ///
- override public int ImplType
- {
- get
- {
- return CSJ2K.j2k.wavelet.WaveletFilter_Fields.WT_FILTER_INT_LIFT;
- }
-
- }
- /// Returns the reversibility of the filter. A filter is considered
- /// reversible if it is suitable for lossless coding.
- ///
- ///
- /// true since the 5x3 is reversible, provided the appropriate
- /// rounding is performed.
- ///
- ///
- override public bool Reversible
- {
- get
- {
- return true;
- }
-
- }
-
- /// An implementation of the synthetize_lpf() method that works on int
- /// data, for the inverse 5x3 wavelet transform using the lifting
- /// scheme. See the general description of the synthetize_lpf() method in
- /// the SynWTFilter class for more details.
- ///
- /// The coefficients of the first lifting step are [-1/4 1 -1/4].
- ///
- /// The coefficients of the second lifting step are [1/2 1 1/2].
- ///
- ///
- /// This is the array that contains the low-pass input
- /// signal.
- ///
- ///
- /// This is the index in lowSig of the first sample to
- /// filter.
- ///
- ///
- /// This is the number of samples in the low-pass input
- /// signal to filter.
- ///
- ///
- /// This is the step, or interleave factor, of the low-pass
- /// input signal samples in the lowSig array.
- ///
- ///
- /// This is the array that contains the high-pass input
- /// signal.
- ///
- ///
- /// This is the index in highSig of the first sample to
- /// filter.
- ///
- ///
- /// This is the number of samples in the high-pass input
- /// signal to filter.
- ///
- ///
- /// This is the step, or interleave factor, of the
- /// high-pass input signal samples in the highSig array.
- ///
- ///
- /// This is the array where the output signal is placed. It
- /// should be long enough to contain the output signal.
- ///
- ///
- /// This is the index in outSig of the element where to put
- /// the first output sample.
- ///
- ///
- /// This is the step, or interleave factor, of the output
- /// samples in the outSig array.
- ///
- ///
- ///
- ///
- ///
- public override void synthetize_lpf(int[] lowSig, int lowOff, int lowLen, int lowStep, int[] highSig, int highOff, int highLen, int highStep, int[] outSig, int outOff, int outStep)
- {
-
- int i;
- int outLen = lowLen + highLen; //Length of the output signal
- int iStep = 2 * outStep; //Upsampling in outSig
- int ik; //Indexing outSig
- int lk; //Indexing lowSig
- int hk; //Indexing highSig
-
- /* Generate even samples (inverse low-pass filter) */
-
- //Initialize counters
- lk = lowOff;
- hk = highOff;
- ik = outOff;
-
- //Handle tail boundary effect. Use symmetric extension.
- if (outLen > 1)
- {
- outSig[ik] = lowSig[lk] - ((highSig[hk] + 1) >> 1);
- }
- else
- {
- outSig[ik] = lowSig[lk];
- }
-
- lk += lowStep;
- hk += highStep;
- ik += iStep;
-
- //Apply lifting step to each "inner" sample.
- for (i = 2; i < outLen - 1; i += 2)
- {
- outSig[ik] = lowSig[lk] - ((highSig[hk - highStep] + highSig[hk] + 2) >> 2);
-
- lk += lowStep;
- hk += highStep;
- ik += iStep;
- }
-
- //Handle head boundary effect if input signal has odd length.
- if ((outLen % 2 == 1) && (outLen > 2))
- {
- outSig[ik] = lowSig[lk] - ((2 * highSig[hk - highStep] + 2) >> 2);
- }
-
- /* Generate odd samples (inverse high pass-filter) */
-
- //Initialize counters
- hk = highOff;
- ik = outOff + outStep;
-
- //Apply first lifting step to each "inner" sample.
- for (i = 1; i < outLen - 1; i += 2)
- {
- // Since signs are inversed (add instead of substract)
- // the +1 rounding dissapears.
- outSig[ik] = highSig[hk] + ((outSig[ik - outStep] + outSig[ik + outStep]) >> 1);
-
- hk += highStep;
- ik += iStep;
- }
-
- //Handle head boundary effect if input signal has even length.
- if (outLen % 2 == 0 && outLen > 1)
- {
- outSig[ik] = highSig[hk] + outSig[ik - outStep];
- }
- }
-
- /// An implementation of the synthetize_hpf() method that works on int
- /// data, for the inverse 5x3 wavelet transform using thelifting
- /// scheme. See the general description of the synthetize_hpf() method in
- /// the SynWTFilter class for more details.
- ///
- /// The coefficients of the first lifting step are [-1/4 1 -1/4].
- ///
- /// The coefficients of the second lifting step are [1/2 1 1/2].
- ///
- ///
- /// This is the array that contains the low-pass input
- /// signal.
- ///
- ///
- /// This is the index in lowSig of the first sample to
- /// filter.
- ///
- ///
- /// This is the number of samples in the low-pass input
- /// signal to filter.
- ///
- ///
- /// This is the step, or interleave factor, of the low-pass
- /// input signal samples in the lowSig array.
- ///
- ///
- /// This is the array that contains the high-pass input
- /// signal.
- ///
- ///
- /// This is the index in highSig of the first sample to
- /// filter.
- ///
- ///
- /// This is the number of samples in the high-pass input
- /// signal to filter.
- ///
- ///
- /// This is the step, or interleave factor, of the
- /// high-pass input signal samples in the highSig array.
- ///
- ///
- /// This is the array where the output signal is placed. It
- /// should be long enough to contain the output signal.
- ///
- ///
- /// This is the index in outSig of the element where to put
- /// the first output sample.
- ///
- ///
- /// This is the step, or interleave factor, of the output
- /// samples in the outSig array.
- ///
- ///
- ///
- ///
- ///
- public override void synthetize_hpf(int[] lowSig, int lowOff, int lowLen, int lowStep, int[] highSig, int highOff, int highLen, int highStep, int[] outSig, int outOff, int outStep)
- {
-
- int i;
- int outLen = lowLen + highLen; //Length of the output signal
- int iStep = 2 * outStep; //Upsampling in outSig
- int ik; //Indexing outSig
- int lk; //Indexing lowSig
- int hk; //Indexing highSig
-
- /* Generate even samples (inverse low-pass filter) */
-
- //Initialize counters
- lk = lowOff;
- hk = highOff;
- ik = outOff + outStep;
-
- //Apply lifting step to each "inner" sample.
- for (i = 1; i < outLen - 1; i += 2)
- {
- outSig[ik] = lowSig[lk] - ((highSig[hk] + highSig[hk + highStep] + 2) >> 2);
-
- lk += lowStep;
- hk += highStep;
- ik += iStep;
- }
-
- if ((outLen > 1) && (outLen % 2 == 0))
- {
- // symmetric extension.
- outSig[ik] = lowSig[lk] - ((2 * highSig[hk] + 2) >> 2);
- }
- /* Generate odd samples (inverse high pass-filter) */
-
- //Initialize counters
- hk = highOff;
- ik = outOff;
-
- if (outLen > 1)
- {
- outSig[ik] = highSig[hk] + outSig[ik + outStep];
- }
- else
- {
- // Normalize for Nyquist gain
- outSig[ik] = highSig[hk] >> 1;
- }
-
- hk += highStep;
- ik += iStep;
-
- //Apply first lifting step to each "inner" sample.
- for (i = 2; i < outLen - 1; i += 2)
- {
- // Since signs are inversed (add instead of substract)
- // the +1 rounding dissapears.
- outSig[ik] = highSig[hk] + ((outSig[ik - outStep] + outSig[ik + outStep]) >> 1);
- hk += highStep;
- ik += iStep;
- }
-
- //Handle head boundary effect if input signal has odd length.
- if (outLen % 2 == 1 && outLen > 1)
- {
- outSig[ik] = highSig[hk] + outSig[ik - outStep];
- }
- }
-
- /// Returns true if the wavelet filter computes or uses the same "inner"
- /// subband coefficient as the full frame wavelet transform, and false
- /// otherwise. In particular, for block based transforms with reduced
- /// overlap, this method should return false. The term "inner" indicates
- /// that this applies only with respect to the coefficient that are not
- /// affected by image boundaries processings such as symmetric extension,
- /// since there is not reference method for this.
- ///
- /// The result depends on the length of the allowed overlap when
- /// compared to the overlap required by the wavelet filter. It also depends
- /// on how overlap processing is implemented in the wavelet filter.
- ///
- ///
- /// This is the number of samples in the input signal
- /// before the first sample to filter that can be used for overlap.
- ///
- ///
- /// This is the number of samples in the input signal
- /// after the last sample to filter that can be used for overlap.
- ///
- ///
- /// This is the lenght of the input signal to filter.The
- /// required number of samples in the input signal after the last sample
- /// depends on the length of the input signal.
- ///
- ///
- /// true if both overlaps are greater than 2, and correct
- /// processing is applied in the analyze() method.
- ///
- ///
- public override bool isSameAsFullWT(int tailOvrlp, int headOvrlp, int inLen)
- {
-
- //If the input signal has even length.
- if (inLen % 2 == 0)
- {
- if (tailOvrlp >= 2 && headOvrlp >= 1)
- return true;
- else
- return false;
- }
- //Else if the input signal has odd length.
- else
- {
- if (tailOvrlp >= 2 && headOvrlp >= 2)
- return true;
- else
- return false;
- }
- }
-
- /// Returns a string of information about the synthesis wavelet filter
- ///
- ///
- /// wavelet filter type.
- ///
- ///
- public override System.String ToString()
- {
- return "w5x3 (lifting)";
- }
- }
-}
\ No newline at end of file
diff --git a/CSJ2K/j2k/wavelet/synthesis/SynWTFilterSpec.cs b/CSJ2K/j2k/wavelet/synthesis/SynWTFilterSpec.cs
deleted file mode 100644
index b9a6f9c3..00000000
--- a/CSJ2K/j2k/wavelet/synthesis/SynWTFilterSpec.cs
+++ /dev/null
@@ -1,210 +0,0 @@
-/*
-* CVS identifier:
-*
-* $Id: SynWTFilterSpec.java,v 1.15 2001/08/02 10:01:30 grosbois Exp $
-*
-* Class: SynWTFilterSpec
-*
-* Description: Synthesis filters specification
-*
-*
-*
-* COPYRIGHT:
-*
-* This software module was originally developed by Raphaël Grosbois and
-* Diego Santa Cruz (Swiss Federal Institute of Technology-EPFL); Joel
-* Askelöf (Ericsson Radio Systems AB); and Bertrand Berthelot, David
-* Bouchard, Félix Henry, Gerard Mozelle and Patrice Onno (Canon Research
-* Centre France S.A) in the course of development of the JPEG2000
-* standard as specified by ISO/IEC 15444 (JPEG 2000 Standard). This
-* software module is an implementation of a part of the JPEG 2000
-* Standard. Swiss Federal Institute of Technology-EPFL, Ericsson Radio
-* Systems AB and Canon Research Centre France S.A (collectively JJ2000
-* Partners) agree not to assert against ISO/IEC and users of the JPEG
-* 2000 Standard (Users) any of their rights under the copyright, not
-* including other intellectual property rights, for this software module
-* with respect to the usage by ISO/IEC and Users of this software module
-* or modifications thereof for use in hardware or software products
-* claiming conformance to the JPEG 2000 Standard. Those intending to use
-* this software module in hardware or software products are advised that
-* their use may infringe existing patents. The original developers of
-* this software module, JJ2000 Partners and ISO/IEC assume no liability
-* for use of this software module or modifications thereof. No license
-* or right to this software module is granted for non JPEG 2000 Standard
-* conforming products. JJ2000 Partners have full right to use this
-* software module for his/her own purpose, assign or donate this
-* software module to any third party and to inhibit third parties from
-* using this software module for non JPEG 2000 Standard conforming
-* products. This copyright notice must be included in all copies or
-* derivative works of this software module.
-*
-* Copyright (c) 1999/2000 JJ2000 Partners.
-* */
-namespace CSJ2K.j2k.wavelet.synthesis
-{
-
- /// This class extends ModuleSpec class for synthesis filters specification
- /// holding purpose.
- ///
- ///
- ///
- ///
- ///
- public class SynWTFilterSpec : ModuleSpec
- {
-
- /// Constructs a new 'SynWTFilterSpec' for the specified number of
- /// components and tiles.
- ///
- ///
- /// The number of tiles
- ///
- ///
- /// The number of components
- ///
- ///
- /// the type of the specification module i.e. tile specific,
- /// component specific or both.
- ///
- ///
- public SynWTFilterSpec(int nt, int nc, byte type) : base(nt, nc, type)
- {
- }
-
- /// Returns the data type used by the filters in this object, as defined in
- /// the 'DataBlk' interface for specified tile-component.
- ///
- ///
- /// Tile index
- ///
- ///
- /// Component index
- ///
- ///
- /// The data type of the filters in this object
- ///
- ///
- ///
- ///
- ///
- public virtual int getWTDataType(int t, int c)
- {
- SynWTFilter[][] an = (SynWTFilter[][])getSpec(t, c);
- return an[0][0].DataType;
- }
-
- /// Returns the horizontal analysis filters to be used in component 'n' and
- /// tile 't'.
- ///
- /// The horizontal analysis filters are returned in an array of
- /// SynWTFilter. Each element contains the horizontal filter for each
- /// resolution level starting with resolution level 1 (i.e. the analysis
- /// filter to go from resolution level 1 to resolution level 0). If there
- /// are less elements than the maximum resolution level, then the last
- /// element is assumed to be repeated.
- ///
- ///
- /// The tile index, in raster scan order
- ///
- ///
- /// The component index.
- ///
- ///
- /// The array of horizontal analysis filters for component 'n' and
- /// tile 't'.
- ///
- ///
- public virtual SynWTFilter[] getHFilters(int t, int c)
- {
- SynWTFilter[][] an = (SynWTFilter[][])getSpec(t, c);
- return an[0];
- }
-
- /// Returns the vertical analysis filters to be used in component 'n' and
- /// tile 't'.
- ///
- /// The vertical analysis filters are returned in an array of
- /// SynWTFilter. Each element contains the vertical filter for each
- /// resolution level starting with resolution level 1 (i.e. the analysis
- /// filter to go from resolution level 1 to resolution level 0). If there
- /// are less elements than the maximum resolution level, then the last
- /// element is assumed to be repeated.
- ///
- ///
- /// The tile index, in raster scan order
- ///
- ///
- /// The component index.
- ///
- ///
- /// The array of horizontal analysis filters for component 'n' and
- /// tile 't'.
- ///
- ///
- public virtual SynWTFilter[] getVFilters(int t, int c)
- {
- SynWTFilter[][] an = (SynWTFilter[][])getSpec(t, c);
- return an[1];
- }
-
- /// Debugging method
- public override System.String ToString()
- {
- System.String str = "";
- SynWTFilter[][] an;
-
- str += ("nTiles=" + nTiles + "\nnComp=" + nComp + "\n\n");
-
- for (int t = 0; t < nTiles; t++)
- {
- for (int c = 0; c < nComp; c++)
- {
- an = (SynWTFilter[][])getSpec(t, c);
-
- str += ("(t:" + t + ",c:" + c + ")\n");
-
- // Horizontal filters
- str += "\tH:";
- for (int i = 0; i < an[0].Length; i++)
- {
- //UPGRADE_TODO: The equivalent in .NET for method 'java.lang.Object.toString' may return a different value. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1043'"
- str += (" " + an[0][i]);
- }
- // Horizontal filters
- str += "\n\tV:";
- for (int i = 0; i < an[1].Length; i++)
- {
- //UPGRADE_TODO: The equivalent in .NET for method 'java.lang.Object.toString' may return a different value. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1043'"
- str += (" " + an[1][i]);
- }
- str += "\n";
- }
- }
-
- return str;
- }
-
- /// Check the reversibility of filters contained is the given
- /// tile-component.
- ///
- ///
- /// The index of the tile
- ///
- ///
- /// The index of the component
- ///
- ///
- public virtual bool isReversible(int t, int c)
- {
- // Note: no need to buffer the result since this method is normally
- // called once per tile-component.
- SynWTFilter[] hfilter = getHFilters(t, c), vfilter = getVFilters(t, c);
-
- // As soon as a filter is not reversible, false can be returned
- for (int i = hfilter.Length - 1; i >= 0; i--)
- if (!hfilter[i].Reversible || !vfilter[i].Reversible)
- return false;
- return true;
- }
- }
-}
\ No newline at end of file
diff --git a/Directory.Build.props b/Directory.Build.props
index 1c8a703b..e080a9ee 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,11 +1,33 @@
-
- 1.1.6
- 1.1.6
- 1.1.6
- $(SolutionDir)\obj\$(Configuration)\$(MSBuildProjectName)\
- $(SolutionDir)\obj\$(Configuration)\$(MSBuildProjectName)\
- $(SolutionDir)\bin\$(Configuration)\$(AssemblyName)\
- $(OutputPath)
-
+
+ OpenMetaverse
+ Utopa Skye LLC, OpenMetaverse Developers
+ Utopia Skye LLC
+ net8.0
+ enable
+ disable
+
+
+
+ all
+ 3.9.50
+
+
+
+ BSD-3-Clause
+ https://github.com/OpenSim-NGC/libopenmetaverse
+ false
+ OMV OpenMetaverse OpenSim Halcyon OpenMetaverseFoundation VirtualWorld VirtualReality 3D SecondLife
+ https://github.com/OpenSim-NGC/libopenmetaverse.git
+ git
+ master
+
+
+
+ true
+ snupkg
+
+ true
+ true
+
diff --git a/LICENSE.txt b/LICENSE.txt
index 43b484b2..426f81ff 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,4 +1,7 @@
+ Copyright (c) Opensimulator, http://opensimulator.org/
+ All rights reserved.
+
Copyright (c) 2006-2016, openmetaverse.co
All rights reserved.
diff --git a/OpenMetaverse.GUI/AvatarList.cs b/OpenMetaverse.GUI/AvatarList.cs
index 0276b7c0..6423d0c1 100644
--- a/OpenMetaverse.GUI/AvatarList.cs
+++ b/OpenMetaverse.GUI/AvatarList.cs
@@ -97,10 +97,10 @@ public AvatarList()
this.ListViewItemSorter = _ColumnSorter;
EventHandler clickHandler = new EventHandler(defaultMenuItem_Click);
- this.ContextMenu = new ContextMenu();
- this.ContextMenu.MenuItems.Add("Offer Teleport", clickHandler);
- this.ContextMenu.MenuItems.Add("Teleport To", clickHandler);
- this.ContextMenu.MenuItems.Add("Walk To", clickHandler);
+ this.ContextMenuStrip = new ContextMenuStrip();
+ this.ContextMenuStrip.Items.Add("Offer Teleport", null, clickHandler);
+ this.ContextMenuStrip.Items.Add("Teleport To", null, clickHandler);
+ this.ContextMenuStrip.Items.Add("Walk To", null, clickHandler);
this.DoubleBuffered = true;
this.ListViewItemSorter = _ColumnSorter;
@@ -360,7 +360,7 @@ private void UpdateCoarseInfo(Simulator sim, List newEntries, List r
private void defaultMenuItem_Click(object sender, EventArgs e)
{
- MenuItem menuItem = (MenuItem)sender;
+ ToolStripItem menuItem = (ToolStripItem)sender;
switch (menuItem.Text)
{
diff --git a/OpenMetaverse.GUI/InventoryTree.cs b/OpenMetaverse.GUI/InventoryTree.cs
index 12e1352d..cf2cc9a9 100644
--- a/OpenMetaverse.GUI/InventoryTree.cs
+++ b/OpenMetaverse.GUI/InventoryTree.cs
@@ -1,226 +1,226 @@
-/*
- * Copyright (c) 2006-2016, openmetaverse.co
- * All rights reserved.
- *
- * - Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * - Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- * - Neither the name of the openmetaverse.co nor the names
- * of its contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Windows.Forms;
-
-namespace OpenMetaverse.GUI
-{
-
- ///
- /// TreeView GUI component for browsing a client's inventory
- ///
- public class InventoryTree : TreeView
- {
- private GridClient _Client;
- private ContextMenu _ContextMenu;
- private UUID _SelectedItemID;
-
- ///
- /// Gets or sets the context menu associated with this control
- ///
- public ContextMenu Menu
- {
- get { return _ContextMenu; }
- set { _ContextMenu = value; }
- }
-
- ///
- /// Gets or sets the GridClient associated with this control
- ///
- public GridClient Client
- {
- get { return _Client; }
- set { if (value != null) InitializeClient(value); }
- }
-
- ///
- /// TreeView control for an unspecified client's inventory
- ///
- public InventoryTree()
- {
- EventHandler clickHandler = new EventHandler(defaultMenuItem_Click);
- _ContextMenu = new ContextMenu();
- _ContextMenu.MenuItems.Add("Wear", clickHandler);
- _ContextMenu.MenuItems.Add("Detach", clickHandler);
-
- this.NodeMouseClick += new TreeNodeMouseClickEventHandler(InventoryTree_NodeMouseClick);
- this.BeforeExpand += new TreeViewCancelEventHandler(InventoryTree_BeforeExpand);
- }
-
- ///
- /// TreeView control for the specified client's inventory
- ///
- ///
- public InventoryTree(GridClient client) : this()
- {
- InitializeClient(client);
- }
-
- ///
- /// Thread-safe method for clearing the TreeView control
- ///
- public void ClearNodes()
- {
- if (this.InvokeRequired) this.BeginInvoke((MethodInvoker)delegate { ClearNodes(); });
- else this.Nodes.Clear();
- }
-
- ///
- /// Thread-safe method for collapsing a TreeNode in the control
- ///
- ///
- public void CollapseNode(TreeNode node)
- {
- if (this.InvokeRequired) this.BeginInvoke((MethodInvoker)delegate { CollapseNode(node); });
- else if (!node.IsExpanded) node.Collapse();
- }
-
- ///
- /// Thread-safe method for expanding a TreeNode in the control
- ///
- ///
- public void ExpandNode(TreeNode node)
- {
- if (this.InvokeRequired) this.BeginInvoke((MethodInvoker)delegate { ExpandNode(node); });
- else if (!node.IsExpanded) node.Expand();
- }
-
- ///
- /// Thread-safe method for updating the contents of the specified folder UUID
- ///
- ///
- public void UpdateFolder(UUID folderID)
- {
- if (this.InvokeRequired) this.BeginInvoke((MethodInvoker)delegate { UpdateFolder(folderID); });
- else
- {
- TreeNode node = null;
- TreeNodeCollection children;
-
- if (folderID != Client.Inventory.Store.RootFolder.UUID)
- {
- TreeNode[] found = Nodes.Find(folderID.ToString(), true);
- if (found.Length > 0)
- {
- node = found[0];
- children = node.Nodes;
- }
- else
- {
- Logger.Log("Received update for unknown TreeView node " + folderID, Helpers.LogLevel.Warning);
- return;
- }
- }
- else children = this.Nodes;
-
- children.Clear();
-
- List contents = Client.Inventory.Store.GetContents(folderID);
- if (contents.Count == 0)
- {
- TreeNode add = children.Add(null, "(empty)");
- add.ForeColor = Color.FromKnownColor(KnownColor.GrayText);
- }
- else
- {
- foreach (InventoryBase inv in contents)
- {
- string key = inv.UUID.ToString();
-
- children.Add(key, inv.Name);
- if (inv is InventoryFolder)
- {
- children[key].Nodes.Add(null, "(loading...)").ForeColor = Color.FromKnownColor(KnownColor.GrayText);
- }
- }
- }
- }
- }
-
- private void InitializeClient(GridClient client)
- {
- _Client = client;
- _Client.Inventory.FolderUpdated += Inventory_OnFolderUpdated;
- _Client.Network.LoginProgress += Network_OnLogin;
- }
-
- private void defaultMenuItem_Click(object sender, EventArgs e)
- {
- MenuItem menuItem = (MenuItem)sender;
-
- InventoryItem item = (InventoryItem)Client.Inventory.Store[_SelectedItemID];
-
- switch (menuItem.Text)
- {
- case "Wear":
- {
- Client.Appearance.Attach(item, AttachmentPoint.Default);
- break;
- }
- case "Detach":
- {
- Client.Appearance.Detach(item);
- break;
- }
- }
- }
-
- void Network_OnLogin(object sender, LoginProgressEventArgs e)
- {
- if (e.Status == LoginStatus.Success)
- {
- if (Client.Inventory.Store != null)
- UpdateFolder(Client.Inventory.Store.RootFolder.UUID);
- }
- }
-
- private void Inventory_OnFolderUpdated(object sender, FolderUpdatedEventArgs e)
- {
- UpdateFolder(e.FolderID);
- }
-
- void InventoryTree_NodeMouseClick(object sender, TreeNodeMouseClickEventArgs e)
- {
- if (e.Button == MouseButtons.Right)
- {
- _SelectedItemID = new UUID(e.Node.Name);
- _ContextMenu.Show(this, e.Location);
- }
- }
-
- private void InventoryTree_BeforeExpand(object sender, TreeViewCancelEventArgs e)
- {
- InventoryFolder folder = (InventoryFolder)Client.Inventory.Store[new UUID(e.Node.Name)];
- Client.Inventory.RequestFolderContents(folder.UUID, _Client.Self.AgentID, true, true, InventorySortOrder.ByDate | InventorySortOrder.FoldersByName);
- }
-
- }
-
-}
-
+/*
+ * Copyright (c) 2006-2016, openmetaverse.co
+ * All rights reserved.
+ *
+ * - Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * - Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ * - Neither the name of the openmetaverse.co nor the names
+ * of its contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Windows.Forms;
+
+namespace OpenMetaverse.GUI
+{
+
+ ///
+ /// TreeView GUI component for browsing a client's inventory
+ ///
+ public class InventoryTree : TreeView
+ {
+ private GridClient _Client;
+ private ContextMenuStrip _ContextMenu;
+ private UUID _SelectedItemID;
+
+ ///
+ /// Gets or sets the context menu associated with this control
+ ///
+ public ContextMenuStrip Menu
+ {
+ get { return _ContextMenu; }
+ set { _ContextMenu = value; }
+ }
+
+ ///
+ /// Gets or sets the GridClient associated with this control
+ ///
+ public GridClient Client
+ {
+ get { return _Client; }
+ set { if (value != null) InitializeClient(value); }
+ }
+
+ ///
+ /// TreeView control for an unspecified client's inventory
+ ///
+ public InventoryTree()
+ {
+ EventHandler clickHandler = new EventHandler(defaultMenuItem_Click);
+ _ContextMenu = new ContextMenuStrip();
+ _ContextMenu.Items.Add("Wear", null, clickHandler);
+ _ContextMenu.Items.Add("Detach", null, clickHandler);
+
+ this.NodeMouseClick += new TreeNodeMouseClickEventHandler(InventoryTree_NodeMouseClick);
+ this.BeforeExpand += new TreeViewCancelEventHandler(InventoryTree_BeforeExpand);
+ }
+
+ ///
+ /// TreeView control for the specified client's inventory
+ ///
+ ///
+ public InventoryTree(GridClient client) : this ()
+ {
+ InitializeClient(client);
+ }
+
+ ///
+ /// Thread-safe method for clearing the TreeView control
+ ///
+ public void ClearNodes()
+ {
+ if (this.InvokeRequired) this.BeginInvoke((MethodInvoker)delegate { ClearNodes(); });
+ else this.Nodes.Clear();
+ }
+
+ ///
+ /// Thread-safe method for collapsing a TreeNode in the control
+ ///
+ ///
+ public void CollapseNode(TreeNode node)
+ {
+ if (this.InvokeRequired) this.BeginInvoke((MethodInvoker)delegate { CollapseNode(node); });
+ else if (!node.IsExpanded) node.Collapse();
+ }
+
+ ///
+ /// Thread-safe method for expanding a TreeNode in the control
+ ///
+ ///
+ public void ExpandNode(TreeNode node)
+ {
+ if (this.InvokeRequired) this.BeginInvoke((MethodInvoker)delegate { ExpandNode(node); });
+ else if (!node.IsExpanded) node.Expand();
+ }
+
+ ///
+ /// Thread-safe method for updating the contents of the specified folder UUID
+ ///
+ ///
+ public void UpdateFolder(UUID folderID)
+ {
+ if (this.InvokeRequired) this.BeginInvoke((MethodInvoker)delegate { UpdateFolder(folderID); });
+ else
+ {
+ TreeNode node = null;
+ TreeNodeCollection children;
+
+ if (folderID != Client.Inventory.Store.RootFolder.UUID)
+ {
+ TreeNode[] found = Nodes.Find(folderID.ToString(), true);
+ if (found.Length > 0)
+ {
+ node = found[0];
+ children = node.Nodes;
+ }
+ else
+ {
+ Logger.Log("Received update for unknown TreeView node " + folderID, Helpers.LogLevel.Warning);
+ return;
+ }
+ }
+ else children = this.Nodes;
+
+ children.Clear();
+
+ List contents = Client.Inventory.Store.GetContents(folderID);
+ if (contents.Count == 0)
+ {
+ TreeNode add = children.Add(null, "(empty)");
+ add.ForeColor = Color.FromKnownColor(KnownColor.GrayText);
+ }
+ else
+ {
+ foreach (InventoryBase inv in contents)
+ {
+ string key = inv.UUID.ToString();
+
+ children.Add(key, inv.Name);
+ if (inv is InventoryFolder)
+ {
+ children[key].Nodes.Add(null, "(loading...)").ForeColor = Color.FromKnownColor(KnownColor.GrayText);
+ }
+ }
+ }
+ }
+ }
+
+ private void InitializeClient(GridClient client)
+ {
+ _Client = client;
+ _Client.Inventory.FolderUpdated += Inventory_OnFolderUpdated;
+ _Client.Network.LoginProgress += Network_OnLogin;
+ }
+
+ private void defaultMenuItem_Click(object sender, EventArgs e)
+ {
+ ToolStripItem menuItem = (ToolStripItem)sender;
+
+ InventoryItem item = (InventoryItem)Client.Inventory.Store[_SelectedItemID];
+
+ switch(menuItem.Text)
+ {
+ case "Wear":
+ {
+ Client.Appearance.Attach(item, AttachmentPoint.Default);
+ break;
+ }
+ case "Detach":
+ {
+ Client.Appearance.Detach(item);
+ break;
+ }
+ }
+ }
+
+ void Network_OnLogin(object sender, LoginProgressEventArgs e)
+ {
+ if (e.Status == LoginStatus.Success)
+ {
+ if (Client.Inventory.Store != null)
+ UpdateFolder(Client.Inventory.Store.RootFolder.UUID);
+ }
+ }
+
+ private void Inventory_OnFolderUpdated(object sender, FolderUpdatedEventArgs e)
+ {
+ UpdateFolder(e.FolderID);
+ }
+
+ void InventoryTree_NodeMouseClick(object sender, TreeNodeMouseClickEventArgs e)
+ {
+ if (e.Button == MouseButtons.Right)
+ {
+ _SelectedItemID = new UUID(e.Node.Name);
+ _ContextMenu.Show(this, e.Location);
+ }
+ }
+
+ private void InventoryTree_BeforeExpand(object sender, TreeViewCancelEventArgs e)
+ {
+ InventoryFolder folder = (InventoryFolder)Client.Inventory.Store[new UUID(e.Node.Name)];
+ Client.Inventory.RequestFolderContents(folder.UUID, _Client.Self.AgentID, true, true, InventorySortOrder.ByDate | InventorySortOrder.FoldersByName);
+ }
+
+ }
+
+}
+
diff --git a/OpenMetaverse.GUI/MiniMap.cs b/OpenMetaverse.GUI/MiniMap.cs
index 5f7b628d..9f9d129f 100644
--- a/OpenMetaverse.GUI/MiniMap.cs
+++ b/OpenMetaverse.GUI/MiniMap.cs
@@ -28,7 +28,9 @@
using OpenMetaverse.Imaging;
using System.Collections.Generic;
using System.Drawing;
+using System.IO;
using System.Windows.Forms;
+using SkiaSharp;
namespace OpenMetaverse.GUI
{
@@ -216,10 +218,23 @@ void Network_OnCurrentSimChanged(object sender, SimChangedEventArgs e)
delegate (TextureRequestState state, AssetTexture asset)
{
if (state == TextureRequestState.Finished)
- OpenJPEG.DecodeToImage(asset.AssetData, out nullImage, out _MapLayer);
+ {
+ SKBitmap skMapLayer;
+ OpenJPEG.DecodeToImage(asset.AssetData, out nullImage, out skMapLayer);
+ _MapLayer = skMapLayer != null ? ConvertToBitmap(skMapLayer) : null;
+ }
});
}
}
+ private static Bitmap ConvertToBitmap(SKBitmap skBitmap)
+ {
+ using SKImage image = SKImage.FromBitmap(skBitmap);
+ using SKData data = image.Encode(SKEncodedImageFormat.Png, 100);
+ using MemoryStream stream = new MemoryStream(data.ToArray());
+ using Bitmap tmp = new Bitmap(stream);
+ return new Bitmap(tmp);
+ }
+
}
}
diff --git a/OpenMetaverse.GUI/OpenMetaverse.GUI.csproj b/OpenMetaverse.GUI/OpenMetaverse.GUI.csproj
index 5f61070c..13728e9e 100644
--- a/OpenMetaverse.GUI/OpenMetaverse.GUI.csproj
+++ b/OpenMetaverse.GUI/OpenMetaverse.GUI.csproj
@@ -1,12 +1,14 @@

Local
- net48
- 1591,1574,0419,0618
+ Library
True
+ net8.0-windows
+ true
+ true
-
+
@@ -17,15 +19,4 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/OpenMetaverse.PrimMesher/OpenMetaverse.PrimMesher.csproj b/OpenMetaverse.PrimMesher/OpenMetaverse.PrimMesher.csproj
deleted file mode 100644
index b18c3b3a..00000000
--- a/OpenMetaverse.PrimMesher/OpenMetaverse.PrimMesher.csproj
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
- net48
- Dhalia Trimble, OpenSim Contributors, Cinder Roxley
- OpenMetaverse.PrimMesher
- OpenMetaverse.PrimMesher
- true
-
-
- full
- TRACE;DEBUG;VERTEX_INDEXER
-
-
- pdbonly
- TRACE;VERTEX_INDEXER
-
-
-
-
-
\ No newline at end of file
diff --git a/OpenMetaverse.PrimMesher/PrimMesher.cs b/OpenMetaverse.PrimMesher/PrimMesher.cs
deleted file mode 100644
index f5a5490e..00000000
--- a/OpenMetaverse.PrimMesher/PrimMesher.cs
+++ /dev/null
@@ -1,2327 +0,0 @@
-/*
- * Copyright (c) Contributors
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of the OpenSimulator Project nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-
-namespace OpenMetaverse.PrimMesher
-{
- public struct Quat
- {
- /// X value
- public float X;
-
- /// Y value
- public float Y;
-
- /// Z value
- public float Z;
-
- /// W value
- public float W;
-
- public Quat(float x, float y, float z, float w)
- {
- X = x;
- Y = y;
- Z = z;
- W = w;
- }
-
- public Quat(Coord axis, float angle)
- {
- axis = axis.Normalize();
-
- angle *= 0.5f;
- var c = (float) Math.Cos(angle);
- var s = (float) Math.Sin(angle);
-
- X = axis.X * s;
- Y = axis.Y * s;
- Z = axis.Z * s;
- W = c;
-
- Normalize();
- }
-
- public float Length()
- {
- return (float) Math.Sqrt(X * X + Y * Y + Z * Z + W * W);
- }
-
- public Quat Normalize()
- {
- const float MAG_THRESHOLD = 0.0000001f;
- var mag = Length();
-
- // Catch very small rounding errors when normalizing
- if (mag > MAG_THRESHOLD)
- {
- var oomag = 1f / mag;
- X *= oomag;
- Y *= oomag;
- Z *= oomag;
- W *= oomag;
- }
- else
- {
- X = 0f;
- Y = 0f;
- Z = 0f;
- W = 1f;
- }
-
- return this;
- }
-
- public static Quat operator *(Quat q1, Quat q2)
- {
- var x = q1.W * q2.X + q1.X * q2.W + q1.Y * q2.Z - q1.Z * q2.Y;
- var y = q1.W * q2.Y - q1.X * q2.Z + q1.Y * q2.W + q1.Z * q2.X;
- var z = q1.W * q2.Z + q1.X * q2.Y - q1.Y * q2.X + q1.Z * q2.W;
- var w = q1.W * q2.W - q1.X * q2.X - q1.Y * q2.Y - q1.Z * q2.Z;
- return new Quat(x, y, z, w);
- }
-
- public override string ToString()
- {
- return "< X: " + X + ", Y: " + Y + ", Z: " + Z + ", W: " + W + ">";
- }
- }
-
- public struct Coord
- {
- public float X;
- public float Y;
- public float Z;
-
- public Coord(float x, float y, float z)
- {
- X = x;
- Y = y;
- Z = z;
- }
-
- public float Length()
- {
- return (float) Math.Sqrt(X * X + Y * Y + Z * Z);
- }
-
- public Coord Invert()
- {
- X = -X;
- Y = -Y;
- Z = -Z;
-
- return this;
- }
-
- public Coord Normalize()
- {
- const float MAG_THRESHOLD = 0.0000001f;
- var mag = Length();
-
- // Catch very small rounding errors when normalizing
- if (mag > MAG_THRESHOLD)
- {
- var oomag = 1.0f / mag;
- X *= oomag;
- Y *= oomag;
- Z *= oomag;
- }
- else
- {
- X = 0.0f;
- Y = 0.0f;
- Z = 0.0f;
- }
-
- return this;
- }
-
- public override string ToString()
- {
- return X + " " + Y + " " + Z;
- }
-
- public static Coord Cross(Coord c1, Coord c2)
- {
- return new Coord(
- c1.Y * c2.Z - c2.Y * c1.Z,
- c1.Z * c2.X - c2.Z * c1.X,
- c1.X * c2.Y - c2.X * c1.Y
- );
- }
-
- public static Coord operator +(Coord v, Coord a)
- {
- return new Coord(v.X + a.X, v.Y + a.Y, v.Z + a.Z);
- }
-
- public static Coord operator *(Coord v, Coord m)
- {
- return new Coord(v.X * m.X, v.Y * m.Y, v.Z * m.Z);
- }
-
- public static Coord operator *(Coord v, Quat q)
- {
- // From http://www.euclideanspace.com/maths/algebra/realNormedAlgebra/quaternions/transforms/
-
- var c2 = new Coord(0.0f, 0.0f, 0.0f);
-
- c2.X = q.W * q.W * v.X +
- 2f * q.Y * q.W * v.Z -
- 2f * q.Z * q.W * v.Y +
- q.X * q.X * v.X +
- 2f * q.Y * q.X * v.Y +
- 2f * q.Z * q.X * v.Z -
- q.Z * q.Z * v.X -
- q.Y * q.Y * v.X;
-
- c2.Y =
- 2f * q.X * q.Y * v.X +
- q.Y * q.Y * v.Y +
- 2f * q.Z * q.Y * v.Z +
- 2f * q.W * q.Z * v.X -
- q.Z * q.Z * v.Y +
- q.W * q.W * v.Y -
- 2f * q.X * q.W * v.Z -
- q.X * q.X * v.Y;
-
- c2.Z =
- 2f * q.X * q.Z * v.X +
- 2f * q.Y * q.Z * v.Y +
- q.Z * q.Z * v.Z -
- 2f * q.W * q.Y * v.X -
- q.Y * q.Y * v.Z +
- 2f * q.W * q.X * v.Y -
- q.X * q.X * v.Z +
- q.W * q.W * v.Z;
-
- return c2;
- }
- }
-
- public struct UVCoord
- {
- public float U;
- public float V;
-
-
- public UVCoord(float u, float v)
- {
- U = u;
- V = v;
- }
-
- public UVCoord Flip()
- {
- U = 1.0f - U;
- V = 1.0f - V;
- return this;
- }
- }
-
- public struct Face
- {
- public int primFace;
-
- // vertices
- public int v1;
-
- public int v2;
- public int v3;
-
- //normals
- public int n1;
-
- public int n2;
- public int n3;
-
- // uvs
- public int uv1;
-
- public int uv2;
- public int uv3;
-
- public Face(int v1, int v2, int v3)
- {
- primFace = 0;
-
- this.v1 = v1;
- this.v2 = v2;
- this.v3 = v3;
-
- n1 = 0;
- n2 = 0;
- n3 = 0;
-
- uv1 = 0;
- uv2 = 0;
- uv3 = 0;
- }
-
- public Face(int v1, int v2, int v3, int n1, int n2, int n3)
- {
- primFace = 0;
-
- this.v1 = v1;
- this.v2 = v2;
- this.v3 = v3;
-
- this.n1 = n1;
- this.n2 = n2;
- this.n3 = n3;
-
- uv1 = 0;
- uv2 = 0;
- uv3 = 0;
- }
-
- public Coord SurfaceNormal(List coordList)
- {
- var c1 = coordList[v1];
- var c2 = coordList[v2];
- var c3 = coordList[v3];
-
- var edge1 = new Coord(c2.X - c1.X, c2.Y - c1.Y, c2.Z - c1.Z);
- var edge2 = new Coord(c3.X - c1.X, c3.Y - c1.Y, c3.Z - c1.Z);
-
- return Coord.Cross(edge1, edge2).Normalize();
- }
- }
-
- public struct ViewerFace
- {
- public int primFaceNumber;
-
- public Coord v1;
- public Coord v2;
- public Coord v3;
-
- public int coordIndex1;
- public int coordIndex2;
- public int coordIndex3;
-
- public Coord n1;
- public Coord n2;
- public Coord n3;
-
- public UVCoord uv1;
- public UVCoord uv2;
- public UVCoord uv3;
-
- public ViewerFace(int primFaceNumber)
- {
- this.primFaceNumber = primFaceNumber;
-
- v1 = new Coord();
- v2 = new Coord();
- v3 = new Coord();
-
- coordIndex1 = coordIndex2 = coordIndex3 = -1; // -1 means not assigned yet
-
- n1 = new Coord();
- n2 = new Coord();
- n3 = new Coord();
-
- uv1 = new UVCoord();
- uv2 = new UVCoord();
- uv3 = new UVCoord();
- }
-
- public void Scale(float x, float y, float z)
- {
- v1.X *= x;
- v1.Y *= y;
- v1.Z *= z;
-
- v2.X *= x;
- v2.Y *= y;
- v2.Z *= z;
-
- v3.X *= x;
- v3.Y *= y;
- v3.Z *= z;
- }
-
- public void AddPos(float x, float y, float z)
- {
- v1.X += x;
- v2.X += x;
- v3.X += x;
-
- v1.Y += y;
- v2.Y += y;
- v3.Y += y;
-
- v1.Z += z;
- v2.Z += z;
- v3.Z += z;
- }
-
- public void AddRot(Quat q)
- {
- v1 *= q;
- v2 *= q;
- v3 *= q;
-
- n1 *= q;
- n2 *= q;
- n3 *= q;
- }
-
- public void CalcSurfaceNormal()
- {
- var edge1 = new Coord(v2.X - v1.X, v2.Y - v1.Y, v2.Z - v1.Z);
- var edge2 = new Coord(v3.X - v1.X, v3.Y - v1.Y, v3.Z - v1.Z);
-
- n1 = n2 = n3 = Coord.Cross(edge1, edge2).Normalize();
- }
- }
-
- internal struct Angle
- {
- internal float angle;
- internal float X;
- internal float Y;
-
- internal Angle(float angle, float x, float y)
- {
- this.angle = angle;
- X = x;
- Y = y;
- }
- }
-
- internal class AngleList
- {
- private static readonly Angle[] angles3 =
- {
- new Angle(0.0f, 1.0f, 0.0f),
- new Angle(0.33333333333333333f, -0.5f, 0.86602540378443871f),
- new Angle(0.66666666666666667f, -0.5f, -0.86602540378443837f),
- new Angle(1.0f, 1.0f, 0.0f)
- };
-
- private static readonly Coord[] normals3 =
- {
- new Coord(0.25f, 0.4330127019f, 0.0f).Normalize(),
- new Coord(-0.5f, 0.0f, 0.0f).Normalize(),
- new Coord(0.25f, -0.4330127019f, 0.0f).Normalize(),
- new Coord(0.25f, 0.4330127019f, 0.0f).Normalize()
- };
-
- private static readonly Angle[] angles4 =
- {
- new Angle(0.0f, 1.0f, 0.0f),
- new Angle(0.25f, 0.0f, 1.0f),
- new Angle(0.5f, -1.0f, 0.0f),
- new Angle(0.75f, 0.0f, -1.0f),
- new Angle(1.0f, 1.0f, 0.0f)
- };
-
- private static readonly Coord[] normals4 =
- {
- new Coord(0.5f, 0.5f, 0.0f).Normalize(),
- new Coord(-0.5f, 0.5f, 0.0f).Normalize(),
- new Coord(-0.5f, -0.5f, 0.0f).Normalize(),
- new Coord(0.5f, -0.5f, 0.0f).Normalize(),
- new Coord(0.5f, 0.5f, 0.0f).Normalize()
- };
-
- private static readonly Angle[] angles24 =
- {
- new Angle(0.0f, 1.0f, 0.0f),
- new Angle(0.041666666666666664f, 0.96592582628906831f, 0.25881904510252074f),
- new Angle(0.083333333333333329f, 0.86602540378443871f, 0.5f),
- new Angle(0.125f, 0.70710678118654757f, 0.70710678118654746f),
- new Angle(0.16666666666666667f, 0.5f, 0.8660254037844386f),
- new Angle(0.20833333333333331f, 0.25881904510252096f, 0.9659258262890682f),
- new Angle(0.25f, 0.0f, 1.0f),
- new Angle(0.29166666666666663f, -0.25881904510252063f, 0.96592582628906831f),
- new Angle(0.33333333333333333f, -0.5f, 0.86602540378443871f),
- new Angle(0.375f, -0.70710678118654746f, 0.70710678118654757f),
- new Angle(0.41666666666666663f, -0.86602540378443849f, 0.5f),
- new Angle(0.45833333333333331f, -0.9659258262890682f, 0.25881904510252102f),
- new Angle(0.5f, -1.0f, 0.0f),
- new Angle(0.54166666666666663f, -0.96592582628906842f, -0.25881904510252035f),
- new Angle(0.58333333333333326f, -0.86602540378443882f, -0.5f),
- new Angle(0.62499999999999989f, -0.70710678118654791f, -0.70710678118654713f),
- new Angle(0.66666666666666667f, -0.5f, -0.86602540378443837f),
- new Angle(0.70833333333333326f, -0.25881904510252152f, -0.96592582628906809f),
- new Angle(0.75f, 0.0f, -1.0f),
- new Angle(0.79166666666666663f, 0.2588190451025203f, -0.96592582628906842f),
- new Angle(0.83333333333333326f, 0.5f, -0.86602540378443904f),
- new Angle(0.875f, 0.70710678118654735f, -0.70710678118654768f),
- new Angle(0.91666666666666663f, 0.86602540378443837f, -0.5f),
- new Angle(0.95833333333333326f, 0.96592582628906809f, -0.25881904510252157f),
- new Angle(1.0f, 1.0f, 0.0f)
- };
-
- internal List angles;
- private float iX, iY; // intersection point
- internal List normals;
-
- private Angle interpolatePoints(float newPoint, Angle p1, Angle p2)
- {
- var m = (newPoint - p1.angle) / (p2.angle - p1.angle);
- return new Angle(newPoint, p1.X + m * (p2.X - p1.X), p1.Y + m * (p2.Y - p1.Y));
- }
-
- private void intersection(double x1, double y1, double x2, double y2, double x3, double y3, double x4,
- double y4)
- {
- // ref: http://local.wasp.uwa.edu.au/~pbourke/geometry/lineline2d/
- var denom = (y4 - y3) * (x2 - x1) - (x4 - x3) * (y2 - y1);
- var uaNumerator = (x4 - x3) * (y1 - y3) - (y4 - y3) * (x1 - x3);
-
- if (denom != 0.0)
- {
- var ua = uaNumerator / denom;
- iX = (float) (x1 + ua * (x2 - x1));
- iY = (float) (y1 + ua * (y2 - y1));
- }
- }
-
- internal void makeAngles(int sides, float startAngle, float stopAngle)
- {
- angles = new List();
- normals = new List();
-
- var twoPi = Math.PI * 2.0;
- var twoPiInv = 1.0f / (float) twoPi;
-
- if (sides < 1)
- throw new Exception("number of sides not greater than zero");
- if (stopAngle <= startAngle)
- throw new Exception("stopAngle not greater than startAngle");
-
- if (sides == 3 || sides == 4 || sides == 24)
- {
- startAngle *= twoPiInv;
- stopAngle *= twoPiInv;
-
- Angle[] sourceAngles;
- if (sides == 3)
- sourceAngles = angles3;
- else if (sides == 4)
- sourceAngles = angles4;
- else sourceAngles = angles24;
-
- var startAngleIndex = (int) (startAngle * sides);
- var endAngleIndex = sourceAngles.Length - 1;
- if (stopAngle < 1.0f)
- endAngleIndex = (int) (stopAngle * sides) + 1;
- if (endAngleIndex == startAngleIndex)
- endAngleIndex++;
-
- for (var angleIndex = startAngleIndex; angleIndex < endAngleIndex + 1; angleIndex++)
- {
- angles.Add(sourceAngles[angleIndex]);
- if (sides == 3)
- normals.Add(normals3[angleIndex]);
- else if (sides == 4)
- normals.Add(normals4[angleIndex]);
- }
-
- if (startAngle > 0.0f)
- angles[0] = interpolatePoints(startAngle, angles[0], angles[1]);
-
- if (stopAngle < 1.0f)
- {
- var lastAngleIndex = angles.Count - 1;
- angles[lastAngleIndex] =
- interpolatePoints(stopAngle, angles[lastAngleIndex - 1], angles[lastAngleIndex]);
- }
- }
- else
- {
- var stepSize = twoPi / sides;
-
- var startStep = (int) (startAngle / stepSize);
- var angle = stepSize * startStep;
- var step = startStep;
- double stopAngleTest = stopAngle;
- if (stopAngle < twoPi)
- {
- stopAngleTest = stepSize * ((int) (stopAngle / stepSize) + 1);
- if (stopAngleTest < stopAngle)
- stopAngleTest += stepSize;
- if (stopAngleTest > twoPi)
- stopAngleTest = twoPi;
- }
-
- while (angle <= stopAngleTest)
- {
- Angle newAngle;
- newAngle.angle = (float) angle;
- newAngle.X = (float) Math.Cos(angle);
- newAngle.Y = (float) Math.Sin(angle);
- angles.Add(newAngle);
- step += 1;
- angle = stepSize * step;
- }
-
- if (startAngle > angles[0].angle)
- {
- Angle newAngle;
- intersection(angles[0].X, angles[0].Y, angles[1].X, angles[1].Y, 0.0f, 0.0f,
- (float) Math.Cos(startAngle), (float) Math.Sin(startAngle));
- newAngle.angle = startAngle;
- newAngle.X = iX;
- newAngle.Y = iY;
- angles[0] = newAngle;
- }
-
- var index = angles.Count - 1;
- if (stopAngle < angles[index].angle)
- {
- Angle newAngle;
- intersection(angles[index - 1].X, angles[index - 1].Y, angles[index].X, angles[index].Y, 0.0f, 0.0f,
- (float) Math.Cos(stopAngle), (float) Math.Sin(stopAngle));
- newAngle.angle = stopAngle;
- newAngle.X = iX;
- newAngle.Y = iY;
- angles[index] = newAngle;
- }
- }
- }
- }
-
- ///
- /// generates a profile for extrusion
- ///
- public class Profile
- {
- private const float twoPi = 2.0f * (float) Math.PI;
- public int bottomFaceNumber;
-
- public bool calcVertexNormals;
-
- public List coords;
- public List cut1CoordIndices;
- public List cut2CoordIndices;
- public Coord cutNormal1;
- public Coord cutNormal2;
-
- public string errorMessage;
-
- public Coord faceNormal = new Coord(0.0f, 0.0f, 1.0f);
- public List faceNumbers;
- public List faces;
- public List faceUVs;
- public List hollowCoordIndices;
- public int hollowFaceNumber = -1;
- public int numHollowVerts;
-
- public int numOuterVerts;
- public int numPrimFaces;
-
- // use these for making individual meshes for each prim face
- public List outerCoordIndices;
-
- public int outerFaceNumber = -1;
- public List us;
- public List vertexNormals;
-
- public Profile()
- {
- coords = new List();
- faces = new List();
- vertexNormals = new List();
- us = new List();
- faceUVs = new List();
- faceNumbers = new List();
- }
-
- public Profile(int sides, float profileStart, float profileEnd, float hollow, int hollowSides, bool createFaces,
- bool calcVertexNormals)
- {
- this.calcVertexNormals = calcVertexNormals;
- coords = new List();
- faces = new List();
- vertexNormals = new List();
- us = new List();
- faceUVs = new List();
- faceNumbers = new List();
-
- var center = new Coord(0.0f, 0.0f, 0.0f);
-
- var hollowCoords = new List();
- var hollowNormals = new List();
- var hollowUs = new List();
-
- if (calcVertexNormals)
- {
- outerCoordIndices = new List();
- hollowCoordIndices = new List();
- cut1CoordIndices = new List();
- cut2CoordIndices = new List();
- }
-
- var hasHollow = hollow > 0.0f;
-
- var hasProfileCut = profileStart > 0.0f || profileEnd < 1.0f;
-
- var angles = new AngleList();
- var hollowAngles = new AngleList();
-
- var xScale = 0.5f;
- var yScale = 0.5f;
- if (sides == 4) // corners of a square are sqrt(2) from center
- {
- xScale = 0.707107f;
- yScale = 0.707107f;
- }
-
- var startAngle = profileStart * twoPi;
- var stopAngle = profileEnd * twoPi;
-
- try
- {
- angles.makeAngles(sides, startAngle, stopAngle);
- }
- catch (Exception ex)
- {
- errorMessage = "makeAngles failed: Exception: " + ex
- + "\nsides: " + sides + " startAngle: " + startAngle + " stopAngle: " + stopAngle;
-
- return;
- }
-
- numOuterVerts = angles.angles.Count;
-
- // flag to create as few triangles as possible for 3 or 4 side profile
- var simpleFace = sides < 5 && !hasHollow && !hasProfileCut;
-
- if (hasHollow)
- {
- if (sides == hollowSides)
- hollowAngles = angles;
- else
- try
- {
- hollowAngles.makeAngles(hollowSides, startAngle, stopAngle);
- }
- catch (Exception ex)
- {
- errorMessage = "makeAngles failed: Exception: " + ex
- + "\nsides: " + sides + " startAngle: " + startAngle + " stopAngle: " +
- stopAngle;
-
- return;
- }
- numHollowVerts = hollowAngles.angles.Count;
- }
- else if (!simpleFace)
- {
- coords.Add(center);
- if (this.calcVertexNormals)
- vertexNormals.Add(new Coord(0.0f, 0.0f, 1.0f));
- us.Add(0.0f);
- }
-
- var z = 0.0f;
-
- Angle angle;
- var newVert = new Coord();
- if (hasHollow && hollowSides != sides)
- {
- var numHollowAngles = hollowAngles.angles.Count;
- for (var i = 0; i < numHollowAngles; i++)
- {
- angle = hollowAngles.angles[i];
- newVert.X = hollow * xScale * angle.X;
- newVert.Y = hollow * yScale * angle.Y;
- newVert.Z = z;
-
- hollowCoords.Add(newVert);
- if (this.calcVertexNormals)
- {
- hollowNormals.Add(hollowSides < 5
- ? hollowAngles.normals[i].Invert()
- : new Coord(-angle.X, -angle.Y, 0.0f));
-
- if (hollowSides == 4)
- hollowUs.Add(angle.angle * hollow * 0.707107f);
- else
- hollowUs.Add(angle.angle * hollow);
- }
- }
- }
-
- var index = 0;
- var numAngles = angles.angles.Count;
-
- for (var i = 0; i < numAngles; i++)
- {
- angle = angles.angles[i];
- newVert.X = angle.X * xScale;
- newVert.Y = angle.Y * yScale;
- newVert.Z = z;
- coords.Add(newVert);
- if (this.calcVertexNormals)
- {
- outerCoordIndices.Add(coords.Count - 1);
-
- if (sides < 5)
- {
- vertexNormals.Add(angles.normals[i]);
- var u = angle.angle;
- us.Add(u);
- }
- else
- {
- vertexNormals.Add(new Coord(angle.X, angle.Y, 0.0f));
- us.Add(angle.angle);
- }
- }
-
- if (hasHollow)
- {
- if (hollowSides == sides)
- {
- newVert.X *= hollow;
- newVert.Y *= hollow;
- newVert.Z = z;
- hollowCoords.Add(newVert);
- if (this.calcVertexNormals)
- {
- hollowNormals.Add(sides < 5
- ? angles.normals[i].Invert()
- : new Coord(-angle.X, -angle.Y, 0.0f));
-
- hollowUs.Add(angle.angle * hollow);
- }
- }
- }
- else if (!simpleFace && createFaces && angle.angle > 0.0001f)
- {
- var newFace = new Face
- {
- v1 = 0,
- v2 = index,
- v3 = index + 1
- };
-
- faces.Add(newFace);
- }
- index += 1;
- }
-
- if (hasHollow)
- {
- hollowCoords.Reverse();
- if (this.calcVertexNormals)
- {
- hollowNormals.Reverse();
- hollowUs.Reverse();
- }
-
- if (createFaces)
- {
- var numTotalVerts = numOuterVerts + numHollowVerts;
-
- if (numOuterVerts == numHollowVerts)
- {
- var newFace = new Face();
-
- for (var coordIndex = 0; coordIndex < numOuterVerts - 1; coordIndex++)
- {
- newFace.v1 = coordIndex;
- newFace.v2 = coordIndex + 1;
- newFace.v3 = numTotalVerts - coordIndex - 1;
- faces.Add(newFace);
-
- newFace.v1 = coordIndex + 1;
- newFace.v2 = numTotalVerts - coordIndex - 2;
- newFace.v3 = numTotalVerts - coordIndex - 1;
- faces.Add(newFace);
- }
- }
- else
- {
- if (numOuterVerts < numHollowVerts)
- {
- var newFace = new Face();
- var j = 0; // j is the index for outer vertices
- var maxJ = numOuterVerts - 1;
- for (var i = 0; i < numHollowVerts; i++) // i is the index for inner vertices
- {
- if (j < maxJ)
- if (angles.angles[j + 1].angle - hollowAngles.angles[i].angle <
- hollowAngles.angles[i].angle - angles.angles[j].angle + 0.000001f)
- {
- newFace.v1 = numTotalVerts - i - 1;
- newFace.v2 = j;
- newFace.v3 = j + 1;
-
- faces.Add(newFace);
- j += 1;
- }
-
- newFace.v1 = j;
- newFace.v2 = numTotalVerts - i - 2;
- newFace.v3 = numTotalVerts - i - 1;
-
- faces.Add(newFace);
- }
- }
- else // numHollowVerts < numOuterVerts
- {
- var newFace = new Face();
- var j = 0; // j is the index for inner vertices
- var maxJ = numHollowVerts - 1;
- for (var i = 0; i < numOuterVerts; i++)
- {
- if (j < maxJ)
- if (hollowAngles.angles[j + 1].angle - angles.angles[i].angle <
- angles.angles[i].angle - hollowAngles.angles[j].angle + 0.000001f)
- {
- newFace.v1 = i;
- newFace.v2 = numTotalVerts - j - 2;
- newFace.v3 = numTotalVerts - j - 1;
-
- faces.Add(newFace);
- j += 1;
- }
-
- newFace.v1 = numTotalVerts - j - 1;
- newFace.v2 = i;
- newFace.v3 = i + 1;
-
- faces.Add(newFace);
- }
- }
- }
- }
-
- if (calcVertexNormals)
- foreach (var hc in hollowCoords)
- {
- coords.Add(hc);
- hollowCoordIndices.Add(coords.Count - 1);
- }
- else
- coords.AddRange(hollowCoords);
-
- if (this.calcVertexNormals)
- {
- vertexNormals.AddRange(hollowNormals);
- us.AddRange(hollowUs);
- }
- }
-
- if (simpleFace && createFaces)
- if (sides == 3)
- {
- faces.Add(new Face(0, 1, 2));
- }
- else if (sides == 4)
- {
- faces.Add(new Face(0, 1, 2));
- faces.Add(new Face(0, 2, 3));
- }
-
- if (calcVertexNormals && hasProfileCut)
- {
- var lastOuterVertIndex = numOuterVerts - 1;
-
- if (hasHollow)
- {
- cut1CoordIndices.Add(0);
- cut1CoordIndices.Add(coords.Count - 1);
-
- cut2CoordIndices.Add(lastOuterVertIndex + 1);
- cut2CoordIndices.Add(lastOuterVertIndex);
-
- cutNormal1.X = coords[0].Y - coords[coords.Count - 1].Y;
- cutNormal1.Y = -(coords[0].X - coords[coords.Count - 1].X);
-
- cutNormal2.X = coords[lastOuterVertIndex + 1].Y - coords[lastOuterVertIndex].Y;
- cutNormal2.Y = -(coords[lastOuterVertIndex + 1].X - coords[lastOuterVertIndex].X);
- }
-
- else
- {
- cut1CoordIndices.Add(0);
- cut1CoordIndices.Add(1);
-
- cut2CoordIndices.Add(lastOuterVertIndex);
- cut2CoordIndices.Add(0);
-
- cutNormal1.X = vertexNormals[1].Y;
- cutNormal1.Y = -vertexNormals[1].X;
-
- cutNormal2.X = -vertexNormals[vertexNormals.Count - 2].Y;
- cutNormal2.Y = vertexNormals[vertexNormals.Count - 2].X;
- }
- cutNormal1.Normalize();
- cutNormal2.Normalize();
- }
-
- MakeFaceUVs();
-
- hollowCoords = null;
- hollowNormals = null;
- hollowUs = null;
-
- if (calcVertexNormals)
- {
- // calculate prim face numbers
-
- // face number order is top, outer, hollow, bottom, start cut, end cut
- // I know it's ugly but so is the whole concept of prim face numbers
-
- var faceNum = 1; // start with outer faces
- outerFaceNumber = faceNum;
-
- var startVert = hasProfileCut && !hasHollow ? 1 : 0;
- if (startVert > 0)
- faceNumbers.Add(-1);
- for (var i = 0; i < numOuterVerts - 1; i++)
- faceNumbers.Add(sides < 5 && i <= sides ? faceNum++ : faceNum);
-
- faceNumbers.Add(hasProfileCut ? -1 : faceNum++);
-
- if (sides > 4 && (hasHollow || hasProfileCut))
- faceNum++;
-
- if (sides < 5 && (hasHollow || hasProfileCut) && numOuterVerts < sides)
- faceNum++;
-
- if (hasHollow)
- {
- for (var i = 0; i < numHollowVerts; i++)
- faceNumbers.Add(faceNum);
-
- hollowFaceNumber = faceNum++;
- }
-
- bottomFaceNumber = faceNum++;
-
- if (hasHollow && hasProfileCut)
- faceNumbers.Add(faceNum++);
-
- for (var i = 0; i < faceNumbers.Count; i++)
- if (faceNumbers[i] == -1)
- faceNumbers[i] = faceNum++;
-
- numPrimFaces = faceNum;
- }
- }
-
- public void MakeFaceUVs()
- {
- faceUVs = new List();
- foreach (var c in coords)
- faceUVs.Add(new UVCoord(1.0f - (0.5f + c.X), 1.0f - (0.5f - c.Y)));
- }
-
- public Profile Copy()
- {
- return Copy(true);
- }
-
- public Profile Copy(bool needFaces)
- {
- var copy = new Profile();
-
- copy.coords.AddRange(coords);
- copy.faceUVs.AddRange(faceUVs);
-
- if (needFaces)
- copy.faces.AddRange(faces);
- if (copy.calcVertexNormals = calcVertexNormals)
- {
- copy.vertexNormals.AddRange(vertexNormals);
- copy.faceNormal = faceNormal;
- copy.cutNormal1 = cutNormal1;
- copy.cutNormal2 = cutNormal2;
- copy.us.AddRange(us);
- copy.faceNumbers.AddRange(faceNumbers);
-
- copy.cut1CoordIndices = new List(cut1CoordIndices);
- copy.cut2CoordIndices = new List(cut2CoordIndices);
- copy.hollowCoordIndices = new List(hollowCoordIndices);
- copy.outerCoordIndices = new List(outerCoordIndices);
- }
- copy.numOuterVerts = numOuterVerts;
- copy.numHollowVerts = numHollowVerts;
-
- return copy;
- }
-
- public void AddPos(Coord v)
- {
- AddPos(v.X, v.Y, v.Z);
- }
-
- public void AddPos(float x, float y, float z)
- {
- int i;
- var numVerts = coords.Count;
- Coord vert;
-
- for (i = 0; i < numVerts; i++)
- {
- vert = coords[i];
- vert.X += x;
- vert.Y += y;
- vert.Z += z;
- coords[i] = vert;
- }
- }
-
- public void AddRot(Quat q)
- {
- int i;
- var numVerts = coords.Count;
-
- for (i = 0; i < numVerts; i++)
- coords[i] *= q;
-
- if (calcVertexNormals)
- {
- var numNormals = vertexNormals.Count;
- for (i = 0; i < numNormals; i++)
- vertexNormals[i] *= q;
-
- faceNormal *= q;
- cutNormal1 *= q;
- cutNormal2 *= q;
- }
- }
-
- public void Scale(float x, float y)
- {
- int i;
- var numVerts = coords.Count;
- Coord vert;
-
- for (i = 0; i < numVerts; i++)
- {
- vert = coords[i];
- vert.X *= x;
- vert.Y *= y;
- coords[i] = vert;
- }
- }
-
- ///
- /// Changes order of the vertex indices and negates the center vertex normal. Does not alter vertex normals of radial
- /// vertices
- ///
- public void FlipNormals()
- {
- int i;
- var numFaces = faces.Count;
- Face tmpFace;
- int tmp;
-
- for (i = 0; i < numFaces; i++)
- {
- tmpFace = faces[i];
- tmp = tmpFace.v3;
- tmpFace.v3 = tmpFace.v1;
- tmpFace.v1 = tmp;
- faces[i] = tmpFace;
- }
-
- if (calcVertexNormals)
- {
- var normalCount = vertexNormals.Count;
- if (normalCount > 0)
- {
- var n = vertexNormals[normalCount - 1];
- n.Z = -n.Z;
- vertexNormals[normalCount - 1] = n;
- }
- }
-
- faceNormal.X = -faceNormal.X;
- faceNormal.Y = -faceNormal.Y;
- faceNormal.Z = -faceNormal.Z;
-
- var numfaceUVs = faceUVs.Count;
- for (i = 0; i < numfaceUVs; i++)
- {
- var uv = faceUVs[i];
- uv.V = 1.0f - uv.V;
- faceUVs[i] = uv;
- }
- }
-
- public void AddValue2FaceVertexIndices(int num)
- {
- var numFaces = faces.Count;
- Face tmpFace;
- for (var i = 0; i < numFaces; i++)
- {
- tmpFace = faces[i];
- tmpFace.v1 += num;
- tmpFace.v2 += num;
- tmpFace.v3 += num;
-
- faces[i] = tmpFace;
- }
- }
-
- public void AddValue2FaceNormalIndices(int num)
- {
- if (calcVertexNormals)
- {
- var numFaces = faces.Count;
- Face tmpFace;
- for (var i = 0; i < numFaces; i++)
- {
- tmpFace = faces[i];
- tmpFace.n1 += num;
- tmpFace.n2 += num;
- tmpFace.n3 += num;
-
- faces[i] = tmpFace;
- }
- }
- }
-
- public void DumpRaw(string path, string name, string title)
- {
- if (path == null)
- return;
- var fileName = name + "_" + title + ".raw";
- var completePath = System.IO.Path.Combine(path, fileName);
- var sw = new StreamWriter(completePath);
-
- for (var i = 0; i < faces.Count; i++)
- {
- var s = coords[faces[i].v1].ToString();
- s += " " + coords[faces[i].v2];
- s += " " + coords[faces[i].v3];
-
- sw.WriteLine(s);
- }
-
- sw.Close();
- }
- }
-
- public struct PathNode
- {
- public Coord position;
- public Quat rotation;
- public float xScale;
- public float yScale;
- public float percentOfPath;
- }
-
- public enum PathType
- {
- Linear = 0,
- Circular = 1,
- Flexible = 2
- }
-
- public class Path
- {
- private const float twoPi = 2.0f * (float) Math.PI;
- public float dimpleBegin;
- public float dimpleEnd = 1.0f;
- public float holeSizeX = 1.0f; // called pathScaleX in pbs
- public float holeSizeY = 0.25f;
- public float pathCutBegin;
- public float pathCutEnd = 1.0f;
- public List pathNodes = new List();
- public float radius;
- public float revolutions = 1.0f;
- public float skew;
- public int stepsPerRevolution = 24;
- public float taperX;
- public float taperY;
- public float topShearX;
- public float topShearY;
-
- public float twistBegin;
- public float twistEnd;
-
- public void Create(PathType pathType, int steps)
- {
- if (taperX > 0.999f)
- taperX = 0.999f;
- if (taperX < -0.999f)
- taperX = -0.999f;
- if (taperY > 0.999f)
- taperY = 0.999f;
- if (taperY < -0.999f)
- taperY = -0.999f;
-
- if (pathType == PathType.Linear || pathType == PathType.Flexible)
- {
- var step = 0;
-
- var length = pathCutEnd - pathCutBegin;
- var twistTotal = twistEnd - twistBegin;
- var twistTotalAbs = Math.Abs(twistTotal);
- if (twistTotalAbs > 0.01f)
- steps += (int) (twistTotalAbs * 3.66); // dahlia's magic number
-
- var start = -0.5f;
- var stepSize = length / steps;
- var percentOfPathMultiplier = stepSize * 0.999999f;
- var xOffset = topShearX * pathCutBegin;
- var yOffset = topShearY * pathCutBegin;
- var zOffset = start;
- var xOffsetStepIncrement = topShearX * length / steps;
- var yOffsetStepIncrement = topShearY * length / steps;
-
- var percentOfPath = pathCutBegin;
- zOffset += percentOfPath;
-
- // sanity checks
-
- var done = false;
-
- while (!done)
- {
- var newNode = new PathNode {xScale = 1.0f};
-
- if (taperX == 0.0f)
- newNode.xScale = 1.0f;
- else if (taperX > 0.0f)
- newNode.xScale = 1.0f - percentOfPath * taperX;
- else newNode.xScale = 1.0f + (1.0f - percentOfPath) * taperX;
-
- newNode.yScale = 1.0f;
- if (taperY == 0.0f)
- newNode.yScale = 1.0f;
- else if (taperY > 0.0f)
- newNode.yScale = 1.0f - percentOfPath * taperY;
- else newNode.yScale = 1.0f + (1.0f - percentOfPath) * taperY;
-
- var twist = twistBegin + twistTotal * percentOfPath;
-
- newNode.rotation = new Quat(new Coord(0.0f, 0.0f, 1.0f), twist);
- newNode.position = new Coord(xOffset, yOffset, zOffset);
- newNode.percentOfPath = percentOfPath;
-
- pathNodes.Add(newNode);
-
- if (step < steps)
- {
- step += 1;
- percentOfPath += percentOfPathMultiplier;
- xOffset += xOffsetStepIncrement;
- yOffset += yOffsetStepIncrement;
- zOffset += stepSize;
- if (percentOfPath > pathCutEnd)
- done = true;
- }
- else
- {
- done = true;
- }
- }
- } // end of linear path code
-
- else // pathType == Circular
- {
- var twistTotal = twistEnd - twistBegin;
-
- // if the profile has a lot of twist, add more layers otherwise the layers may overlap
- // and the resulting mesh may be quite inaccurate. This method is arbitrary and doesn't
- // accurately match the viewer
- var twistTotalAbs = Math.Abs(twistTotal);
- if (twistTotalAbs > 0.01f)
- {
- if (twistTotalAbs > Math.PI * 1.5f)
- steps *= 2;
- if (twistTotalAbs > Math.PI * 3.0f)
- steps *= 2;
- }
-
- var yPathScale = holeSizeY * 0.5f;
- var pathLength = pathCutEnd - pathCutBegin;
- var totalSkew = skew * 2.0f * pathLength;
- var skewStart = pathCutBegin * 2.0f * skew - skew;
- var xOffsetTopShearXFactor = topShearX * (0.25f + 0.5f * (0.5f - holeSizeY));
- var yShearCompensation = 1.0f + Math.Abs(topShearY) * 0.25f;
-
- // It's not quite clear what pushY (Y top shear) does, but subtracting it from the start and end
- // angles appears to approximate it's effects on path cut. Likewise, adding it to the angle used
- // to calculate the sine for generating the path radius appears to approximate it's effects there
- // too, but there are some subtle differences in the radius which are noticeable as the prim size
- // increases and it may affect megaprims quite a bit. The effect of the Y top shear parameter on
- // the meshes generated with this technique appear nearly identical in shape to the same prims when
- // displayed by the viewer.
-
- var startAngle = twoPi * pathCutBegin * revolutions - topShearY * 0.9f;
- var endAngle = twoPi * pathCutEnd * revolutions - topShearY * 0.9f;
- var stepSize = twoPi / stepsPerRevolution;
-
- var step = (int) (startAngle / stepSize);
- var angle = startAngle;
-
- var done = false;
- while (!done) // loop through the length of the path and add the layers
- {
- var newNode = new PathNode();
-
- var xProfileScale = (1.0f - Math.Abs(skew)) * holeSizeX;
- var yProfileScale = holeSizeY;
-
- var percentOfPath = angle / (twoPi * revolutions);
- var percentOfAngles = (angle - startAngle) / (endAngle - startAngle);
-
- if (taperX > 0.01f)
- xProfileScale *= 1.0f - percentOfPath * taperX;
- else if (taperX < -0.01f)
- xProfileScale *= 1.0f + (1.0f - percentOfPath) * taperX;
-
- if (taperY > 0.01f)
- yProfileScale *= 1.0f - percentOfPath * taperY;
- else if (taperY < -0.01f)
- yProfileScale *= 1.0f + (1.0f - percentOfPath) * taperY;
-
- newNode.xScale = xProfileScale;
- newNode.yScale = yProfileScale;
-
- var radiusScale = 1.0f;
- if (radius > 0.001f)
- radiusScale = 1.0f - radius * percentOfPath;
- else if (radius < 0.001f)
- radiusScale = 1.0f + radius * (1.0f - percentOfPath);
-
- var twist = twistBegin + twistTotal * percentOfPath;
-
- var xOffset = 0.5f * (skewStart + totalSkew * percentOfAngles);
- xOffset += (float) Math.Sin(angle) * xOffsetTopShearXFactor;
-
- var yOffset = yShearCompensation * (float) Math.Cos(angle) * (0.5f - yPathScale) * radiusScale;
-
- var zOffset = (float) Math.Sin(angle + topShearY) * (0.5f - yPathScale) * radiusScale;
-
- newNode.position = new Coord(xOffset, yOffset, zOffset);
-
- // now orient the rotation of the profile layer relative to it's position on the path
- // adding taperY to the angle used to generate the quat appears to approximate the viewer
-
- newNode.rotation = new Quat(new Coord(1.0f, 0.0f, 0.0f), angle + topShearY);
-
- // next apply twist rotation to the profile layer
- if (twistTotal != 0.0f || twistBegin != 0.0f)
- newNode.rotation *= new Quat(new Coord(0.0f, 0.0f, 1.0f), twist);
-
- newNode.percentOfPath = percentOfPath;
-
- pathNodes.Add(newNode);
-
- // calculate terms for next iteration
- // calculate the angle for the next iteration of the loop
-
- if (angle >= endAngle - 0.01)
- {
- done = true;
- }
- else
- {
- step += 1;
- angle = stepSize * step;
- if (angle > endAngle)
- angle = endAngle;
- }
- }
- }
- }
- }
-
- public class PrimMesh
- {
- private const float twoPi = 2.0f * (float) Math.PI;
- public bool calcVertexNormals;
-
- public List coords;
- public float dimpleBegin;
- public float dimpleEnd = 1.0f;
- public string errorMessage = "";
- public List faces;
-
- public float holeSizeX = 1.0f; // called pathScaleX in pbs
- public float holeSizeY = 0.25f;
- private readonly float hollow;
- private readonly int hollowSides = 4;
- public List normals;
- private bool normalsProcessed;
-
- public int numPrimFaces;
- public float pathCutBegin;
- public float pathCutEnd = 1.0f;
- private readonly float profileEnd = 1.0f;
-
- private readonly float profileStart;
- public float radius;
- public float revolutions = 1.0f;
-
- private readonly int sides = 4;
- public float skew;
- public bool sphereMode = false;
- public int stepsPerRevolution = 24;
- public float taperX;
- public float taperY;
- public float topShearX;
- public float topShearY;
- public int twistBegin;
- public int twistEnd;
-
- public List viewerFaces;
- public bool viewerMode;
-
-
- ///
- /// Constructs a PrimMesh object and creates the profile for extrusion.
- ///
- ///
- ///
- ///
- ///
- ///
- public PrimMesh(int sides, float profileStart, float profileEnd, float hollow, int hollowSides)
- {
- coords = new List();
- faces = new List();
-
- this.sides = sides;
- this.profileStart = profileStart;
- this.profileEnd = profileEnd;
- this.hollow = hollow;
- this.hollowSides = hollowSides;
-
- if (sides < 3)
- this.sides = 3;
- if (hollowSides < 3)
- this.hollowSides = 3;
- if (profileStart < 0.0f)
- this.profileStart = 0.0f;
- if (profileEnd > 1.0f)
- this.profileEnd = 1.0f;
- if (profileEnd < 0.02f)
- this.profileEnd = 0.02f;
- if (profileStart >= profileEnd)
- this.profileStart = profileEnd - 0.02f;
- if (hollow > 0.99f)
- this.hollow = 0.99f;
- if (hollow < 0.0f)
- this.hollow = 0.0f;
- }
-
- public int ProfileOuterFaceNumber { get; private set; } = -1;
-
- public int ProfileHollowFaceNumber { get; private set; } = -1;
-
- public bool HasProfileCut { get; private set; }
-
- public bool HasHollow { get; private set; }
-
- ///
- /// Human readable string representation of the parameters used to create a mesh.
- ///
- ///
- public string ParamsToDisplayString()
- {
- var s = "";
- s += "sides..................: " + sides;
- s += "\nhollowSides..........: " + hollowSides;
- s += "\nprofileStart.........: " + profileStart;
- s += "\nprofileEnd...........: " + profileEnd;
- s += "\nhollow...............: " + hollow;
- s += "\ntwistBegin...........: " + twistBegin;
- s += "\ntwistEnd.............: " + twistEnd;
- s += "\ntopShearX............: " + topShearX;
- s += "\ntopShearY............: " + topShearY;
- s += "\npathCutBegin.........: " + pathCutBegin;
- s += "\npathCutEnd...........: " + pathCutEnd;
- s += "\ndimpleBegin..........: " + dimpleBegin;
- s += "\ndimpleEnd............: " + dimpleEnd;
- s += "\nskew.................: " + skew;
- s += "\nholeSizeX............: " + holeSizeX;
- s += "\nholeSizeY............: " + holeSizeY;
- s += "\ntaperX...............: " + taperX;
- s += "\ntaperY...............: " + taperY;
- s += "\nradius...............: " + radius;
- s += "\nrevolutions..........: " + revolutions;
- s += "\nstepsPerRevolution...: " + stepsPerRevolution;
- s += "\nsphereMode...........: " + sphereMode;
- s += "\nhasProfileCut........: " + HasProfileCut;
- s += "\nhasHollow............: " + HasHollow;
- s += "\nviewerMode...........: " + viewerMode;
-
- return s;
- }
-
- ///
- /// Extrudes a profile along a path.
- ///
- public void Extrude(PathType pathType)
- {
- var needEndFaces = false;
-
- coords = new List();
- this.faces = new List();
-
- if (viewerMode)
- {
- viewerFaces = new List();
- calcVertexNormals = true;
- }
-
- if (calcVertexNormals)
- normals = new List();
-
- var steps = 1;
-
- var length = pathCutEnd - pathCutBegin;
- normalsProcessed = false;
-
- if (viewerMode && sides == 3)
- if (Math.Abs(taperX) > 0.01 || Math.Abs(taperY) > 0.01)
- steps = (int) (steps * 4.5 * length);
-
- if (sphereMode)
- HasProfileCut = profileEnd - profileStart < 0.4999f;
- else
- HasProfileCut = profileEnd - profileStart < 0.9999f;
- HasHollow = this.hollow > 0.001f;
-
- var twistBegin = this.twistBegin / 360.0f * twoPi;
- var twistEnd = this.twistEnd / 360.0f * twoPi;
- var twistTotal = twistEnd - twistBegin;
- var twistTotalAbs = Math.Abs(twistTotal);
- if (twistTotalAbs > 0.01f)
- steps += (int) (twistTotalAbs * 3.66); // dahlia's magic number
-
- var hollow = this.hollow;
-
- if (pathType == PathType.Circular)
- {
- needEndFaces = false;
- if (pathCutBegin != 0.0f || pathCutEnd != 1.0f)
- needEndFaces = true;
- else if (taperX != 0.0f || taperY != 0.0f)
- needEndFaces = true;
- else if (skew != 0.0f)
- needEndFaces = true;
- else if (twistTotal != 0.0f)
- needEndFaces = true;
- else if (radius != 0.0f)
- needEndFaces = true;
- }
- else
- {
- needEndFaces = true;
- }
-
- // sanity checks
- var initialProfileRot = 0.0f;
- if (pathType == PathType.Circular)
- {
- switch (sides)
- {
- case 3:
- initialProfileRot = (float) Math.PI;
- if (hollowSides == 4)
- {
- if (hollow > 0.7f)
- hollow = 0.7f;
- hollow *= 0.707f;
- }
- else
- {
- hollow *= 0.5f;
- }
- break;
- case 4:
- initialProfileRot = 0.25f * (float) Math.PI;
- if (hollowSides != 4)
- hollow *= 0.707f;
- break;
- default:
- if (sides > 4)
- {
- initialProfileRot = (float) Math.PI;
- if (hollowSides == 4)
- {
- if (hollow > 0.7f)
- hollow = 0.7f;
- hollow /= 0.7f;
- }
- }
- break;
- }
- }
- else
- {
- switch (sides)
- {
- case 3:
- if (hollowSides == 4)
- {
- if (hollow > 0.7f)
- hollow = 0.7f;
- hollow *= 0.707f;
- }
- else
- {
- hollow *= 0.5f;
- }
- break;
- case 4:
- initialProfileRot = 1.25f * (float) Math.PI;
- if (hollowSides != 4)
- hollow *= 0.707f;
- break;
- case 24 when hollowSides == 4:
- hollow *= 1.414f;
- break;
- }
- }
-
- var profile = new Profile(sides, profileStart, profileEnd, hollow, hollowSides, true, calcVertexNormals);
- errorMessage = profile.errorMessage;
-
- numPrimFaces = profile.numPrimFaces;
-
- var cut1FaceNumber = profile.bottomFaceNumber + 1;
- var cut2FaceNumber = cut1FaceNumber + 1;
- if (!needEndFaces)
- {
- cut1FaceNumber -= 2;
- cut2FaceNumber -= 2;
- }
-
- ProfileOuterFaceNumber = profile.outerFaceNumber;
- if (!needEndFaces)
- ProfileOuterFaceNumber--;
-
- if (HasHollow)
- {
- ProfileHollowFaceNumber = profile.hollowFaceNumber;
- if (!needEndFaces)
- ProfileHollowFaceNumber--;
- }
-
- var cut1Vert = -1;
- var cut2Vert = -1;
- if (HasProfileCut)
- {
- cut1Vert = HasHollow ? profile.coords.Count - 1 : 0;
- cut2Vert = HasHollow ? profile.numOuterVerts - 1 : profile.numOuterVerts;
- }
-
- if (initialProfileRot != 0.0f)
- {
- profile.AddRot(new Quat(new Coord(0.0f, 0.0f, 1.0f), initialProfileRot));
- if (viewerMode)
- profile.MakeFaceUVs();
- }
-
- var lastCutNormal1 = new Coord();
- var lastCutNormal2 = new Coord();
- var thisV = 0.0f;
- var lastV = 0.0f;
-
- var path = new Path
- {
- twistBegin = twistBegin,
- twistEnd = twistEnd,
- topShearX = topShearX,
- topShearY = topShearY,
- pathCutBegin = pathCutBegin,
- pathCutEnd = pathCutEnd,
- dimpleBegin = dimpleBegin,
- dimpleEnd = dimpleEnd,
- skew = skew,
- holeSizeX = holeSizeX,
- holeSizeY = holeSizeY,
- taperX = taperX,
- taperY = taperY,
- radius = radius,
- revolutions = revolutions,
- stepsPerRevolution = stepsPerRevolution
- };
-
- path.Create(pathType, steps);
-
- for (var nodeIndex = 0; nodeIndex < path.pathNodes.Count; nodeIndex++)
- {
- var node = path.pathNodes[nodeIndex];
- var newLayer = profile.Copy();
- newLayer.Scale(node.xScale, node.yScale);
-
- newLayer.AddRot(node.rotation);
- newLayer.AddPos(node.position);
-
- if (needEndFaces && nodeIndex == 0)
- {
- newLayer.FlipNormals();
-
- // add the bottom faces to the viewerFaces list
- if (viewerMode)
- {
- var faceNormal = newLayer.faceNormal;
- var newViewerFace = new ViewerFace(profile.bottomFaceNumber);
- var numFaces = newLayer.faces.Count;
- var faces = newLayer.faces;
-
- for (var i = 0; i < numFaces; i++)
- {
- var face = faces[i];
- newViewerFace.v1 = newLayer.coords[face.v1];
- newViewerFace.v2 = newLayer.coords[face.v2];
- newViewerFace.v3 = newLayer.coords[face.v3];
-
- newViewerFace.coordIndex1 = face.v1;
- newViewerFace.coordIndex2 = face.v2;
- newViewerFace.coordIndex3 = face.v3;
-
- newViewerFace.n1 = faceNormal;
- newViewerFace.n2 = faceNormal;
- newViewerFace.n3 = faceNormal;
-
- newViewerFace.uv1 = newLayer.faceUVs[face.v1];
- newViewerFace.uv2 = newLayer.faceUVs[face.v2];
- newViewerFace.uv3 = newLayer.faceUVs[face.v3];
-
- if (pathType == PathType.Linear)
- {
- newViewerFace.uv1.Flip();
- newViewerFace.uv2.Flip();
- newViewerFace.uv3.Flip();
- }
-
- viewerFaces.Add(newViewerFace);
- }
- }
- } // if (nodeIndex == 0)
-
- // append this layer
-
- var coordsLen = coords.Count;
- newLayer.AddValue2FaceVertexIndices(coordsLen);
-
- coords.AddRange(newLayer.coords);
-
- if (calcVertexNormals)
- {
- newLayer.AddValue2FaceNormalIndices(normals.Count);
- normals.AddRange(newLayer.vertexNormals);
- }
-
- if (node.percentOfPath < pathCutBegin + 0.01f || node.percentOfPath > pathCutEnd - 0.01f)
- this.faces.AddRange(newLayer.faces);
-
- // fill faces between layers
-
- var numVerts = newLayer.coords.Count;
- var newFace1 = new Face();
- var newFace2 = new Face();
-
- thisV = 1.0f - node.percentOfPath;
-
- if (nodeIndex > 0)
- {
- var startVert = coordsLen + 1;
- var endVert = coords.Count;
-
- if (sides < 5 || HasProfileCut || HasHollow)
- startVert--;
-
- for (var i = startVert; i < endVert; i++)
- {
- var iNext = i + 1;
- if (i == endVert - 1)
- iNext = startVert;
-
- var whichVert = i - startVert;
-
- newFace1.v1 = i;
- newFace1.v2 = i - numVerts;
- newFace1.v3 = iNext;
-
- newFace1.n1 = newFace1.v1;
- newFace1.n2 = newFace1.v2;
- newFace1.n3 = newFace1.v3;
- faces.Add(newFace1);
-
- newFace2.v1 = iNext;
- newFace2.v2 = i - numVerts;
- newFace2.v3 = iNext - numVerts;
-
- newFace2.n1 = newFace2.v1;
- newFace2.n2 = newFace2.v2;
- newFace2.n3 = newFace2.v3;
- faces.Add(newFace2);
-
- if (viewerMode)
- {
- // add the side faces to the list of viewerFaces here
-
- var primFaceNum = profile.faceNumbers[whichVert];
- if (!needEndFaces)
- primFaceNum -= 1;
-
- var newViewerFace1 = new ViewerFace(primFaceNum);
- var newViewerFace2 = new ViewerFace(primFaceNum);
-
- var uIndex = whichVert;
- if (!HasHollow && sides > 4 && uIndex < newLayer.us.Count - 1)
- uIndex++;
-
- var u1 = newLayer.us[uIndex];
- var u2 = 1.0f;
- if (uIndex < newLayer.us.Count - 1)
- u2 = newLayer.us[uIndex + 1];
-
- if (whichVert == cut1Vert || whichVert == cut2Vert)
- {
- u1 = 0.0f;
- u2 = 1.0f;
- }
- else if (sides < 5)
- {
- if (whichVert < profile.numOuterVerts)
- {
- // boxes and prisms have one texture face per side of the prim, so the U values have to be scaled
- // to reflect the entire texture width
- u1 *= sides;
- u2 *= sides;
- u2 -= (int) u1;
- u1 -= (int) u1;
- if (u2 < 0.1f)
- u2 = 1.0f;
- }
- }
-
- if (sphereMode)
- if (whichVert != cut1Vert && whichVert != cut2Vert)
- {
- u1 = u1 * 2.0f - 1.0f;
- u2 = u2 * 2.0f - 1.0f;
-
- if (whichVert >= newLayer.numOuterVerts)
- {
- u1 -= hollow;
- u2 -= hollow;
- }
- }
-
- newViewerFace1.uv1.U = u1;
- newViewerFace1.uv2.U = u1;
- newViewerFace1.uv3.U = u2;
-
- newViewerFace1.uv1.V = thisV;
- newViewerFace1.uv2.V = lastV;
- newViewerFace1.uv3.V = thisV;
-
- newViewerFace2.uv1.U = u2;
- newViewerFace2.uv2.U = u1;
- newViewerFace2.uv3.U = u2;
-
- newViewerFace2.uv1.V = thisV;
- newViewerFace2.uv2.V = lastV;
- newViewerFace2.uv3.V = lastV;
-
- newViewerFace1.v1 = coords[newFace1.v1];
- newViewerFace1.v2 = coords[newFace1.v2];
- newViewerFace1.v3 = coords[newFace1.v3];
-
- newViewerFace2.v1 = coords[newFace2.v1];
- newViewerFace2.v2 = coords[newFace2.v2];
- newViewerFace2.v3 = coords[newFace2.v3];
-
- newViewerFace1.coordIndex1 = newFace1.v1;
- newViewerFace1.coordIndex2 = newFace1.v2;
- newViewerFace1.coordIndex3 = newFace1.v3;
-
- newViewerFace2.coordIndex1 = newFace2.v1;
- newViewerFace2.coordIndex2 = newFace2.v2;
- newViewerFace2.coordIndex3 = newFace2.v3;
-
- // profile cut faces
- if (whichVert == cut1Vert)
- {
- newViewerFace1.primFaceNumber = cut1FaceNumber;
- newViewerFace2.primFaceNumber = cut1FaceNumber;
- newViewerFace1.n1 = newLayer.cutNormal1;
- newViewerFace1.n2 = newViewerFace1.n3 = lastCutNormal1;
-
- newViewerFace2.n1 = newViewerFace2.n3 = newLayer.cutNormal1;
- newViewerFace2.n2 = lastCutNormal1;
- }
- else if (whichVert == cut2Vert)
- {
- newViewerFace1.primFaceNumber = cut2FaceNumber;
- newViewerFace2.primFaceNumber = cut2FaceNumber;
- newViewerFace1.n1 = newLayer.cutNormal2;
- newViewerFace1.n2 = lastCutNormal2;
- newViewerFace1.n3 = lastCutNormal2;
-
- newViewerFace2.n1 = newLayer.cutNormal2;
- newViewerFace2.n3 = newLayer.cutNormal2;
- newViewerFace2.n2 = lastCutNormal2;
- }
-
- else // outer and hollow faces
- {
- if (sides < 5 && whichVert < newLayer.numOuterVerts ||
- hollowSides < 5 && whichVert >= newLayer.numOuterVerts)
- {
- // looks terrible when path is twisted... need vertex normals here
- newViewerFace1.CalcSurfaceNormal();
- newViewerFace2.CalcSurfaceNormal();
- }
- else
- {
- newViewerFace1.n1 = normals[newFace1.n1];
- newViewerFace1.n2 = normals[newFace1.n2];
- newViewerFace1.n3 = normals[newFace1.n3];
-
- newViewerFace2.n1 = normals[newFace2.n1];
- newViewerFace2.n2 = normals[newFace2.n2];
- newViewerFace2.n3 = normals[newFace2.n3];
- }
- }
-
- viewerFaces.Add(newViewerFace1);
- viewerFaces.Add(newViewerFace2);
- }
- }
- }
-
- lastCutNormal1 = newLayer.cutNormal1;
- lastCutNormal2 = newLayer.cutNormal2;
- lastV = thisV;
-
- if (needEndFaces && nodeIndex == path.pathNodes.Count - 1 && viewerMode)
- {
- // add the top faces to the viewerFaces list here
- var faceNormal = newLayer.faceNormal;
- var newViewerFace = new ViewerFace(0);
- var numFaces = newLayer.faces.Count;
- var faces = newLayer.faces;
-
- for (var i = 0; i < numFaces; i++)
- {
- var face = faces[i];
- newViewerFace.v1 = newLayer.coords[face.v1 - coordsLen];
- newViewerFace.v2 = newLayer.coords[face.v2 - coordsLen];
- newViewerFace.v3 = newLayer.coords[face.v3 - coordsLen];
-
- newViewerFace.coordIndex1 = face.v1 - coordsLen;
- newViewerFace.coordIndex2 = face.v2 - coordsLen;
- newViewerFace.coordIndex3 = face.v3 - coordsLen;
-
- newViewerFace.n1 = faceNormal;
- newViewerFace.n2 = faceNormal;
- newViewerFace.n3 = faceNormal;
-
- newViewerFace.uv1 = newLayer.faceUVs[face.v1 - coordsLen];
- newViewerFace.uv2 = newLayer.faceUVs[face.v2 - coordsLen];
- newViewerFace.uv3 = newLayer.faceUVs[face.v3 - coordsLen];
-
- if (pathType == PathType.Linear)
- {
- newViewerFace.uv1.Flip();
- newViewerFace.uv2.Flip();
- newViewerFace.uv3.Flip();
- }
-
- viewerFaces.Add(newViewerFace);
- }
- }
- } // for (int nodeIndex = 0; nodeIndex < path.pathNodes.Count; nodeIndex++)
- }
-
-
- ///
- /// DEPRICATED - use Extrude(PathType.Linear) instead
- /// Extrudes a profile along a straight line path. Used for prim types box, cylinder, and prism.
- ///
- public void ExtrudeLinear()
- {
- Extrude(PathType.Linear);
- }
-
-
- ///
- /// DEPRICATED - use Extrude(PathType.Circular) instead
- /// Extrude a profile into a circular path prim mesh. Used for prim types torus, tube, and ring.
- ///
- public void ExtrudeCircular()
- {
- Extrude(PathType.Circular);
- }
-
-
- private Coord SurfaceNormal(Coord c1, Coord c2, Coord c3)
- {
- var edge1 = new Coord(c2.X - c1.X, c2.Y - c1.Y, c2.Z - c1.Z);
- var edge2 = new Coord(c3.X - c1.X, c3.Y - c1.Y, c3.Z - c1.Z);
-
- var normal = Coord.Cross(edge1, edge2);
-
- normal.Normalize();
-
- return normal;
- }
-
- private Coord SurfaceNormal(Face face)
- {
- return SurfaceNormal(coords[face.v1], coords[face.v2], coords[face.v3]);
- }
-
- ///
- /// Calculate the surface normal for a face in the list of faces
- ///
- ///
- ///
- public Coord SurfaceNormal(int faceIndex)
- {
- var numFaces = faces.Count;
- if (faceIndex < 0 || faceIndex >= numFaces)
- throw new Exception("faceIndex out of range");
-
- return SurfaceNormal(faces[faceIndex]);
- }
-
- ///
- /// Duplicates a PrimMesh object. All object properties are copied by value, including lists.
- ///
- ///
- public PrimMesh Copy()
- {
- var copy = new PrimMesh(sides, profileStart, profileEnd, hollow, hollowSides)
- {
- twistBegin = twistBegin,
- twistEnd = twistEnd,
- topShearX = topShearX,
- topShearY = topShearY,
- pathCutBegin = pathCutBegin,
- pathCutEnd = pathCutEnd,
- dimpleBegin = dimpleBegin,
- dimpleEnd = dimpleEnd,
- skew = skew,
- holeSizeX = holeSizeX,
- holeSizeY = holeSizeY,
- taperX = taperX,
- taperY = taperY,
- radius = radius,
- revolutions = revolutions,
- stepsPerRevolution = stepsPerRevolution,
- calcVertexNormals = calcVertexNormals,
- normalsProcessed = normalsProcessed,
- viewerMode = viewerMode,
- numPrimFaces = numPrimFaces,
- errorMessage = errorMessage,
- coords = new List(coords),
- faces = new List(faces),
- viewerFaces = new List(viewerFaces),
- normals = new List(normals)
- };
-
-
- return copy;
- }
-
- ///
- /// Calculate surface normals for all of the faces in the list of faces in this mesh
- ///
- public void CalcNormals()
- {
- if (normalsProcessed)
- return;
-
- normalsProcessed = true;
-
- var numFaces = faces.Count;
-
- if (!calcVertexNormals)
- normals = new List();
-
- for (var i = 0; i < numFaces; i++)
- {
- var face = faces[i];
-
- normals.Add(SurfaceNormal(i).Normalize());
-
- var normIndex = normals.Count - 1;
- face.n1 = normIndex;
- face.n2 = normIndex;
- face.n3 = normIndex;
-
- faces[i] = face;
- }
- }
-
- ///
- /// Adds a value to each XYZ vertex coordinate in the mesh
- ///
- ///
- ///
- ///
- public void AddPos(float x, float y, float z)
- {
- int i;
- var numVerts = coords.Count;
- Coord vert;
-
- for (i = 0; i < numVerts; i++)
- {
- vert = coords[i];
- vert.X += x;
- vert.Y += y;
- vert.Z += z;
- coords[i] = vert;
- }
-
- if (viewerFaces != null)
- {
- var numViewerFaces = viewerFaces.Count;
-
- for (i = 0; i < numViewerFaces; i++)
- {
- var v = viewerFaces[i];
- v.AddPos(x, y, z);
- viewerFaces[i] = v;
- }
- }
- }
-
- ///
- /// Rotates the mesh
- ///
- ///
- public void AddRot(Quat q)
- {
- int i;
- var numVerts = coords.Count;
-
- for (i = 0; i < numVerts; i++)
- coords[i] *= q;
-
- if (normals != null)
- {
- var numNormals = normals.Count;
- for (i = 0; i < numNormals; i++)
- normals[i] *= q;
- }
-
- if (viewerFaces != null)
- {
- var numViewerFaces = viewerFaces.Count;
-
- for (i = 0; i < numViewerFaces; i++)
- {
- var v = viewerFaces[i];
- v.v1 *= q;
- v.v2 *= q;
- v.v3 *= q;
-
- v.n1 *= q;
- v.n2 *= q;
- v.n3 *= q;
- viewerFaces[i] = v;
- }
- }
- }
-
-#if VERTEX_INDEXER
- public VertexIndexer GetVertexIndexer()
- {
- if (viewerMode && viewerFaces.Count > 0)
- return new VertexIndexer(this);
- return null;
- }
-#endif
-
- ///
- /// Scales the mesh
- ///
- ///
- ///
- ///
- public void Scale(float x, float y, float z)
- {
- int i;
- var numVerts = coords.Count;
- //Coord vert;
-
- var m = new Coord(x, y, z);
- for (i = 0; i < numVerts; i++)
- coords[i] *= m;
-
- if (viewerFaces != null)
- {
- var numViewerFaces = viewerFaces.Count;
- for (i = 0; i < numViewerFaces; i++)
- {
- var v = viewerFaces[i];
- v.v1 *= m;
- v.v2 *= m;
- v.v3 *= m;
- viewerFaces[i] = v;
- }
- }
- }
-
- ///
- /// Dumps the mesh to a Blender compatible "Raw" format file
- ///
- ///
- ///
- ///
- public void DumpRaw(string path, string name, string title)
- {
- if (path == null)
- return;
- var fileName = name + "_" + title + ".raw";
- var completePath = System.IO.Path.Combine(path, fileName);
- var sw = new StreamWriter(completePath);
-
- for (var i = 0; i < faces.Count; i++)
- {
- var s = coords[faces[i].v1].ToString();
- s += " " + coords[faces[i].v2];
- s += " " + coords[faces[i].v3];
-
- sw.WriteLine(s);
- }
-
- sw.Close();
- }
- }
-}
\ No newline at end of file
diff --git a/OpenMetaverse.Rendering.Meshmerizer/MeshmerizerR.cs b/OpenMetaverse.Rendering.Meshmerizer/MeshmerizerR.cs
index d2a32cc8..1ee46ee3 100644
--- a/OpenMetaverse.Rendering.Meshmerizer/MeshmerizerR.cs
+++ b/OpenMetaverse.Rendering.Meshmerizer/MeshmerizerR.cs
@@ -31,12 +31,9 @@
* using PrimMesher (http://forge.opensimulator.org/projects/primmesher).
*/
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-
using OMV = OpenMetaverse;
using OMVR = OpenMetaverse.Rendering;
+using SkiaSharp;
namespace OpenMetaverse.Rendering
{
@@ -44,7 +41,7 @@ namespace OpenMetaverse.Rendering
/// Meshing code based on the Idealist Viewer (20081213).
///
[RendererName("MeshmerizerR")]
- public class MeshmerizerR : IRendering
+ public class MeshmerizerR : OMVR.IRendering
{
///
/// Generates a basic mesh structure from a primitive
@@ -58,16 +55,15 @@ public OMVR.SimpleMesh GenerateSimpleMesh(Primitive prim, OMVR.DetailLevel lod)
if (newPrim == null)
return null;
- SimpleMesh mesh = new SimpleMesh();
- mesh.Path = new Path();
- mesh.Prim = prim;
- mesh.Profile = new Profile();
- mesh.Vertices = new List(newPrim.coords.Count);
- for (int i = 0; i < newPrim.coords.Count; i++)
+ SimpleMesh mesh = new()
{
- PrimMesher.Coord c = newPrim.coords[i];
- mesh.Vertices.Add(new Vertex { Position = new Vector3(c.X, c.Y, c.Z) });
- }
+ Path = new Path(),
+ Prim = prim,
+ Profile = new Profile(),
+ Vertices = new List(newPrim.coords.Count)
+ };
+ for (int i = 0; i < newPrim.coords.Count; i++)
+ mesh.Vertices.Add(new Vertex { Position = newPrim.coords[i] });
mesh.Indices = new List(newPrim.faces.Count * 3);
for (int i = 0; i < newPrim.faces.Count; i++)
@@ -88,7 +84,7 @@ public OMVR.SimpleMesh GenerateSimpleMesh(Primitive prim, OMVR.DetailLevel lod)
/// Sculpt texture
/// Level of detail to generate the mesh at
/// The generated mesh or null on failure
- public OMVR.SimpleMesh GenerateSimpleSculptMesh(OMV.Primitive prim, Bitmap sculptTexture, OMVR.DetailLevel lod)
+ public OMVR.SimpleMesh GenerateSimpleSculptMesh(OMV.Primitive prim, SKBitmap sculptTexture, OMVR.DetailLevel lod)
{
OMVR.FacetedMesh faceted = GenerateFacetedSculptMesh(prim, sculptTexture, lod);
@@ -110,6 +106,97 @@ public OMVR.SimpleMesh GenerateSimpleSculptMesh(OMV.Primitive prim, Bitmap sculp
return null;
}
+ public static FacetedMesh m_BasicBoxMesh = null;
+ private static readonly object m_BasicBoxMeshLock = new();
+ public static List m_indexs_012023 = [0, 1, 2, 0, 2, 3];
+ public static List m_indexs_012213 = [0, 1, 2, 2, 1, 3];
+ public static List m_indexs_012302 = [0, 1, 2, 3, 0, 2];
+ public static FacetedMesh GetBasicBoxMesh()
+ {
+ if(m_BasicBoxMesh == null)
+ {
+ lock (m_BasicBoxMeshLock)
+ {
+ m_BasicBoxMesh ??= new()
+ {
+ Faces =
+ [
+ new Face()
+ {
+ Vertices =
+ [
+ new() { Position = new(-0.5f, -0.5f, 0.5f), Normal = Vector3.UnitZ, TexCoord = new(0f, 0f)},
+ new() { Position = new( 0.5f, -0.5f, 0.5f), Normal = Vector3.UnitZ, TexCoord = new(1f, 0f)},
+ new() { Position = new( 0.5f, 0.5f, 0.5f), Normal = Vector3.UnitZ, TexCoord = new(1f, 1f)},
+ new() { Position = new(-0.5f, 0.5f, 0.5f), Normal = Vector3.UnitZ, TexCoord = new(0f, 1f)},
+ ],
+ Indices = m_indexs_012023,
+ },
+ new Face()
+ {
+ Vertices =
+ [
+ new() { Position = new(-0.5f, -0.5f, 0.5f), Normal = -Vector3.UnitY, TexCoord = new(0f, 1f)},
+ new() { Position = new(-0.5f, -0.5f, -0.5f), Normal = -Vector3.UnitY, TexCoord = new(0f, 0f)},
+ new() { Position = new( 0.5f, -0.5f, 0.5f), Normal = -Vector3.UnitY, TexCoord = new(1f, 1f)},
+ new() { Position = new( 0.5f, -0.5f, -0.5f), Normal = -Vector3.UnitY, TexCoord = new(1f, 0f)},
+ ],
+ Indices = m_indexs_012213,
+ },
+ new Face()
+ {
+ Vertices =
+ [
+ new() { Position = new( 0.5f, -0.5f, 0.5f), Normal = Vector3.UnitX, TexCoord = new(0f, 1f)},
+ new() { Position = new( 0.5f, -0.5f, -0.5f), Normal = Vector3.UnitX, TexCoord = new(0f, 0f)},
+ new() { Position = new( 0.5f, 0.5f, 0.5f), Normal = Vector3.UnitX, TexCoord = new(1f, 1f)},
+ new() { Position = new( 0.5f, 0.5f, -0.5f), Normal = Vector3.UnitX, TexCoord = new(1f, 0f)},
+ ],
+ Indices = m_indexs_012213,
+ },
+ new Face()
+ {
+ Vertices =
+ [
+ new() { Position = new( 0.5f, 0.5f, 0.5f), Normal = Vector3.UnitY, TexCoord = new(0f, 1f)},
+ new() { Position = new( 0.5f, 0.5f, -0.5f), Normal = Vector3.UnitY, TexCoord = new(0f, 0f)},
+ new() { Position = new( -0.5f, 0.5f, 0.5f), Normal = Vector3.UnitY, TexCoord = new(1f, 1f)},
+ new() { Position = new( -0.5f, 0.5f, -0.5f), Normal = Vector3.UnitY, TexCoord = new(1f, 0f)},
+ ],
+ Indices = m_indexs_012213,
+ },
+ new Face()
+ {
+ Vertices =
+ [
+ new() { Position = new( -0.5f, 0.5f, 0.5f), Normal = -Vector3.UnitX, TexCoord = new(0f, 1f)},
+ new() { Position = new( -0.5f, 0.5f, -0.5f), Normal = -Vector3.UnitX, TexCoord = new(0f, 0f)},
+ new() { Position = new( -0.5f, -0.5f, 0.5f), Normal = -Vector3.UnitX, TexCoord = new(1f, 1f)},
+ new() { Position = new( -0.5f, -0.5f, -0.5f), Normal = -Vector3.UnitX, TexCoord = new(1f, 0f)},
+ ],
+ Indices = m_indexs_012213,
+ },
+ new Face()
+ {
+ Vertices =
+ [
+ new() { Position = new( 0.5f, 0.5f, -0.5f), Normal = -Vector3.UnitZ, TexCoord = new(1f, 0f)},
+ new() { Position = new( 0.5f, -0.5f, -0.5f), Normal = -Vector3.UnitZ, TexCoord = new(1f, 1f)},
+ new() { Position = new( -0.5f, -0.5f, -0.5f), Normal = -Vector3.UnitZ, TexCoord = new(0f, 1f)},
+ new() { Position = new( -0.5f, 0.5f, -0.5f), Normal = -Vector3.UnitZ, TexCoord = new(0f, 0f)},
+ ],
+ Indices = m_indexs_012302,
+ },
+ ]
+ };
+ }
+ }
+
+ return m_BasicBoxMesh;
+ }
+
+
+
///
/// Generates a a series of faces, each face containing a mesh and
/// metadata
@@ -119,35 +206,52 @@ public OMVR.SimpleMesh GenerateSimpleSculptMesh(OMV.Primitive prim, Bitmap sculp
/// The generated mesh
public OMVR.FacetedMesh GenerateFacetedMesh(OMV.Primitive prim, OMVR.DetailLevel lod)
{
- bool isSphere = ((OMV.ProfileCurve)(prim.PrimData.profileCurve & 0x07) == OMV.ProfileCurve.HalfCircle);
+ OMV.ProfileCurve profileCurve = (OMV.ProfileCurve)(prim.PrimData.profileCurve & 0x07);
+
+ if ( profileCurve == OMV.ProfileCurve.Square && prim.PrimData.PathCurve == OMV.PathCurve.Line)
+ {
+ if( prim.PrimData.ProfileHole == 0 &&
+ prim.PrimData.ProfileBegin == 0f && prim.PrimData.ProfileEnd == 1f &&
+ prim.PrimData.PathBegin == 0f && prim.PrimData.PathEnd == 1f &&
+ prim.PrimData.PathScaleX == 1f && prim.PrimData.PathScaleY == 1f &&
+ prim.PrimData.PathShearX == 0 && prim.PrimData.PathShearY == 0 &&
+ prim.PrimData.PathRevolutions == 1f
+ )
+ {
+ return GetBasicBoxMesh();
+ }
+ }
+
PrimMesher.PrimMesh newPrim = GeneratePrimMesh(prim, lod, true);
if (newPrim == null)
return null;
// copy the vertex information into OMVR.IRendering structures
- OMVR.FacetedMesh omvrmesh = new OMVR.FacetedMesh();
- omvrmesh.Faces = new List();
- omvrmesh.Prim = prim;
- omvrmesh.Profile = new OMVR.Profile();
- omvrmesh.Profile.Faces = new List();
- omvrmesh.Profile.Positions = new List();
- omvrmesh.Path = new OMVR.Path();
- omvrmesh.Path.Points = new List();
+ OMVR.FacetedMesh omvrmesh = new()
+ {
+ Faces = [],
+ Prim = prim,
+ Profile = new() { Faces = [], Positions = [] },
+ Path = new() { Points = [] }
+ };
+
var indexer = newPrim.GetVertexIndexer();
for (int i = 0; i < indexer.numPrimFaces; i++)
{
- OMVR.Face oface = new OMVR.Face();
- oface.Vertices = new List();
- oface.Indices = new List();
- oface.TextureFace = prim.Textures.GetFace((uint)i);
+ OMVR.Face oface = new()
+ {
+ Vertices = [],
+ Indices = [],
+ TextureFace = prim.Textures.GetFace((uint)i)
+ };
for (int j = 0; j < indexer.viewerVertices[i].Count; j++)
{
var vert = new OMVR.Vertex();
var m = indexer.viewerVertices[i][j];
- vert.Position = new Vector3(m.v.X, m.v.Y, m.v.Z);
- vert.Normal = new Vector3(m.n.X, m.n.Y, m.n.Z);
+ vert.Position = m.v;
+ vert.Normal = m.n;
vert.TexCoord = new OMV.Vector2(m.uv.U, 1.0f - m.uv.V);
oface.Vertices.Add(vert);
}
@@ -173,7 +277,7 @@ public OMVR.FacetedMesh GenerateFacetedMesh(OMV.Primitive prim, OMVR.DetailLevel
/// routine since all the context for finding teh texture is elsewhere.
///
/// The faceted mesh or null if can't do it
- public OMVR.FacetedMesh GenerateFacetedSculptMesh(OMV.Primitive prim, Bitmap scupltTexture, OMVR.DetailLevel lod)
+ public OMVR.FacetedMesh GenerateFacetedSculptMesh(OMV.Primitive prim, SKBitmap scupltTexture, OMVR.DetailLevel lod)
{
PrimMesher.SculptMesh.SculptType smSculptType;
switch (prim.Sculpt.Type)
@@ -327,16 +431,16 @@ public void TransformTexCoords(List vertices, OMV.Vector3 center, O
private PrimMesher.PrimMesh GeneratePrimMesh(Primitive prim, DetailLevel lod, bool viewerMode)
{
- OMV.Primitive.ConstructionData primData = prim.PrimData;
int sides = 4;
int hollowsides = 4;
- float profileBegin = primData.ProfileBegin;
- float profileEnd = primData.ProfileEnd;
+ float profileBegin = prim.PrimData.ProfileBegin;
+ float profileEnd = prim.PrimData.ProfileEnd;
bool isSphere = false;
- if ((OMV.ProfileCurve)(primData.profileCurve & 0x07) == OMV.ProfileCurve.Circle)
+ OMV.ProfileCurve profileCurve = (OMV.ProfileCurve)(prim.PrimData.profileCurve & 0x07);
+ if (profileCurve == OMV.ProfileCurve.Circle)
{
switch (lod)
{
@@ -351,9 +455,9 @@ private PrimMesher.PrimMesh GeneratePrimMesh(Primitive prim, DetailLevel lod, bo
break;
}
}
- else if ((OMV.ProfileCurve)(primData.profileCurve & 0x07) == OMV.ProfileCurve.EqualTriangle)
+ else if (profileCurve == OMV.ProfileCurve.EqualTriangle)
sides = 3;
- else if ((OMV.ProfileCurve)(primData.profileCurve & 0x07) == OMV.ProfileCurve.HalfCircle)
+ else if (profileCurve == OMV.ProfileCurve.HalfCircle)
{
// half circle, prim is a sphere
isSphere = true;
@@ -373,9 +477,9 @@ private PrimMesher.PrimMesh GeneratePrimMesh(Primitive prim, DetailLevel lod, bo
profileEnd = 0.5f * profileEnd + 0.5f;
}
- if ((OMV.HoleType)primData.ProfileHole == OMV.HoleType.Same)
+ if ((OMV.HoleType)prim.PrimData.ProfileHole == OMV.HoleType.Same)
hollowsides = sides;
- else if ((OMV.HoleType)primData.ProfileHole == OMV.HoleType.Circle)
+ else if (prim.PrimData.ProfileHole == OMV.HoleType.Circle)
{
switch (lod)
{
@@ -390,21 +494,21 @@ private PrimMesher.PrimMesh GeneratePrimMesh(Primitive prim, DetailLevel lod, bo
break;
}
}
- else if ((OMV.HoleType)primData.ProfileHole == OMV.HoleType.Triangle)
+ else if (prim.PrimData.ProfileHole == OMV.HoleType.Triangle)
hollowsides = 3;
- PrimMesher.PrimMesh newPrim = new PrimMesher.PrimMesh(sides, profileBegin, profileEnd, (float)primData.ProfileHollow, hollowsides);
+ PrimMesher.PrimMesh newPrim = new(sides, profileBegin, profileEnd, prim.PrimData.ProfileHollow, hollowsides);
newPrim.viewerMode = viewerMode;
newPrim.sphereMode = isSphere;
- newPrim.holeSizeX = primData.PathScaleX;
- newPrim.holeSizeY = primData.PathScaleY;
- newPrim.pathCutBegin = primData.PathBegin;
- newPrim.pathCutEnd = primData.PathEnd;
- newPrim.topShearX = primData.PathShearX;
- newPrim.topShearY = primData.PathShearY;
- newPrim.radius = primData.PathRadiusOffset;
- newPrim.revolutions = primData.PathRevolutions;
- newPrim.skew = primData.PathSkew;
+ newPrim.holeSizeX = prim.PrimData.PathScaleX;
+ newPrim.holeSizeY = prim.PrimData.PathScaleY;
+ newPrim.pathCutBegin = prim.PrimData.PathBegin;
+ newPrim.pathCutEnd = prim.PrimData.PathEnd;
+ newPrim.topShearX = prim.PrimData.PathShearX;
+ newPrim.topShearY = prim.PrimData.PathShearY;
+ newPrim.radius = prim.PrimData.PathRadiusOffset;
+ newPrim.revolutions = prim.PrimData.PathRevolutions;
+ newPrim.skew = prim.PrimData.PathSkew;
switch (lod)
{
case OMVR.DetailLevel.Low:
@@ -418,20 +522,20 @@ private PrimMesher.PrimMesh GeneratePrimMesh(Primitive prim, DetailLevel lod, bo
break;
}
- if ((primData.PathCurve == OMV.PathCurve.Line) || (primData.PathCurve == OMV.PathCurve.Flexible))
+ if ((prim.PrimData.PathCurve == OMV.PathCurve.Line) || (prim.PrimData.PathCurve == OMV.PathCurve.Flexible))
{
- newPrim.taperX = 1.0f - primData.PathScaleX;
- newPrim.taperY = 1.0f - primData.PathScaleY;
- newPrim.twistBegin = (int)(180 * primData.PathTwistBegin);
- newPrim.twistEnd = (int)(180 * primData.PathTwist);
+ newPrim.taperX = 1.0f - prim.PrimData.PathScaleX;
+ newPrim.taperY = 1.0f - prim.PrimData.PathScaleY;
+ newPrim.twistBegin = (int)(180 * prim.PrimData.PathTwistBegin);
+ newPrim.twistEnd = (int)(180 * prim.PrimData.PathTwist);
newPrim.ExtrudeLinear();
}
else
{
- newPrim.taperX = primData.PathTaperX;
- newPrim.taperY = primData.PathTaperY;
- newPrim.twistBegin = (int)(360 * primData.PathTwistBegin);
- newPrim.twistEnd = (int)(360 * primData.PathTwist);
+ newPrim.taperX = prim.PrimData.PathTaperX;
+ newPrim.taperY = prim.PrimData.PathTaperY;
+ newPrim.twistBegin = (int)(360 * prim.PrimData.PathTwistBegin);
+ newPrim.twistEnd = (int)(360 * prim.PrimData.PathTwist);
newPrim.ExtrudeCircular();
}
diff --git a/OpenMetaverse.Rendering.Meshmerizer/OpenMetaverse.Rendering.Meshmerizer.csproj b/OpenMetaverse.Rendering.Meshmerizer/OpenMetaverse.Rendering.Meshmerizer.csproj
index f3b90a4c..2efdd8d8 100644
--- a/OpenMetaverse.Rendering.Meshmerizer/OpenMetaverse.Rendering.Meshmerizer.csproj
+++ b/OpenMetaverse.Rendering.Meshmerizer/OpenMetaverse.Rendering.Meshmerizer.csproj
@@ -1,19 +1,23 @@

Local
- net48
+ Library
+ OpenMetaverse.Rendering.Meshmerizer
+ Full primitive and sculpt mesh renderer using the Meshmerizer engine for the OpenMetaverse library.
True
- 1591,1574,0419,0618
true
-
-
-
-
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/OpenMetaverse.Rendering.Simple/OpenMetaverse.Rendering.Simple.csproj b/OpenMetaverse.Rendering.Simple/OpenMetaverse.Rendering.Simple.csproj
index 030e6b5d..5724560c 100644
--- a/OpenMetaverse.Rendering.Simple/OpenMetaverse.Rendering.Simple.csproj
+++ b/OpenMetaverse.Rendering.Simple/OpenMetaverse.Rendering.Simple.csproj
@@ -1,14 +1,12 @@

Local
- net48
+ Library
+ OpenMetaverse.Rendering.Simple
+ Simple faceted primitive mesh renderer for the OpenMetaverse library.
True
- 1591,1574,0419,0618
true
-
-
-
diff --git a/OpenMetaverse.Rendering.Simple/SimpleRenderer.cs b/OpenMetaverse.Rendering.Simple/SimpleRenderer.cs
index 370487c0..85eb0709 100644
--- a/OpenMetaverse.Rendering.Simple/SimpleRenderer.cs
+++ b/OpenMetaverse.Rendering.Simple/SimpleRenderer.cs
@@ -25,6 +25,7 @@
*/
using System.Collections.Generic;
+using SkiaSharp;
namespace OpenMetaverse.Rendering
{
@@ -46,7 +47,7 @@ public SimpleMesh GenerateSimpleMesh(Primitive prim, DetailLevel lod)
return mesh;
}
- public SimpleMesh GenerateSimpleSculptMesh(Primitive prim, System.Drawing.Bitmap sculptTexture, DetailLevel lod)
+ public SimpleMesh GenerateSimpleSculptMesh(Primitive prim, SKBitmap sculptTexture, DetailLevel lod)
{
return GenerateSimpleMesh(prim, lod);
}
@@ -65,7 +66,7 @@ public FacetedMesh GenerateFacetedMesh(Primitive prim, DetailLevel lod)
return mesh;
}
- public FacetedMesh GenerateFacetedSculptMesh(Primitive prim, System.Drawing.Bitmap sculptTexture, DetailLevel lod)
+ public FacetedMesh GenerateFacetedSculptMesh(Primitive prim, SKBitmap sculptTexture, DetailLevel lod)
{
return GenerateFacetedMesh(prim, lod);
}
diff --git a/OpenMetaverse.StructuredData/JSON/JsonData.cs b/OpenMetaverse.StructuredData/JSON/JsonData.cs
index d96712b9..e2a8446e 100644
--- a/OpenMetaverse.StructuredData/JSON/JsonData.cs
+++ b/OpenMetaverse.StructuredData/JSON/JsonData.cs
@@ -36,7 +36,6 @@ public class JsonData : IJsonWrapper, IEquatable
private IList> object_list;
#endregion
-
#region Properties
public int Count
{
@@ -136,8 +135,7 @@ ICollection IDictionary.Keys
EnsureDictionary();
IList keys = new List();
- foreach (KeyValuePair entry in
- object_list)
+ foreach (KeyValuePair entry in object_list)
{
keys.Add(entry.Key);
}
@@ -153,8 +151,7 @@ ICollection IDictionary.Values
EnsureDictionary();
IList values = new List();
- foreach (KeyValuePair entry in
- object_list)
+ foreach (KeyValuePair entry in object_list)
{
values.Add(entry.Value);
}
@@ -263,8 +260,7 @@ object IOrderedDictionary.this[int idx]
inst_object[old_entry.Key] = data;
- KeyValuePair entry =
- new KeyValuePair(old_entry.Key, data);
+ KeyValuePair entry = new KeyValuePair(old_entry.Key, data);
object_list[idx] = entry;
}
@@ -304,8 +300,7 @@ public JsonData this[string prop_name]
{
EnsureDictionary();
- KeyValuePair entry =
- new KeyValuePair(prop_name, value);
+ KeyValuePair entry = new KeyValuePair(prop_name, value);
if (inst_object.ContainsKey(prop_name))
{
@@ -348,8 +343,7 @@ public JsonData this[int index]
else
{
KeyValuePair entry = object_list[index];
- KeyValuePair new_entry =
- new KeyValuePair(entry.Key, value);
+ KeyValuePair new_entry = new KeyValuePair(entry.Key, value);
object_list[index] = new_entry;
inst_object[entry.Key] = value;
@@ -497,11 +491,11 @@ public static explicit operator Int32(JsonData data)
public static explicit operator Int64(JsonData data)
{
- if (data.type != JsonType.Long)
+ if (data.type != JsonType.Long && data.type != JsonType.Int)
throw new InvalidCastException(
"Instance of JsonData doesn't hold an int");
- return data.inst_long;
+ return (data.type == JsonType.Long) ? data.inst_long : data.inst_int;
}
public static explicit operator String(JsonData data)
@@ -530,8 +524,7 @@ void IDictionary.Add(object key, object value)
EnsureDictionary().Add(key, data);
- KeyValuePair entry =
- new KeyValuePair((string)key, data);
+ KeyValuePair entry = new KeyValuePair((string)key, data);
object_list.Add(entry);
json = null;
diff --git a/OpenMetaverse.StructuredData/JSON/JsonException.cs b/OpenMetaverse.StructuredData/JSON/JsonException.cs
index 509fb253..cc44377e 100644
--- a/OpenMetaverse.StructuredData/JSON/JsonException.cs
+++ b/OpenMetaverse.StructuredData/JSON/JsonException.cs
@@ -21,29 +21,22 @@ public JsonException() : base()
}
internal JsonException(ParserToken token) :
- base(String.Format(
- "Invalid token '{0}' in input string", token))
+ base(String.Format("Invalid token '{0}' in input string", token))
{
}
- internal JsonException(ParserToken token,
- Exception inner_exception) :
- base(String.Format(
- "Invalid token '{0}' in input string", token),
- inner_exception)
+ internal JsonException(ParserToken token, Exception inner_exception) :
+ base(String.Format("Invalid token '{0}' in input string", token), inner_exception)
{
}
internal JsonException(int c) :
- base(String.Format(
- "Invalid character '{0}' in input string", (char)c))
+ base(String.Format("Invalid character '{0}' in input string", (char)c))
{
}
internal JsonException(int c, Exception inner_exception) :
- base(String.Format(
- "Invalid character '{0}' in input string", (char)c),
- inner_exception)
+ base(String.Format("Invalid character '{0}' in input string", (char)c), inner_exception)
{
}
diff --git a/OpenMetaverse.StructuredData/JSON/JsonMapper.cs b/OpenMetaverse.StructuredData/JSON/JsonMapper.cs
index b4241930..3c6614f8 100644
--- a/OpenMetaverse.StructuredData/JSON/JsonMapper.cs
+++ b/OpenMetaverse.StructuredData/JSON/JsonMapper.cs
@@ -26,14 +26,12 @@ internal struct PropertyMetadata
public Type Type;
}
-
internal struct ArrayMetadata
{
private Type element_type;
private bool is_array;
private bool is_list;
-
public Type ElementType
{
get
@@ -60,7 +58,6 @@ public bool IsList
}
}
-
internal struct ObjectMetadata
{
private Type element_type;
@@ -68,7 +65,6 @@ internal struct ObjectMetadata
private IDictionary properties;
-
public Type ElementType
{
get
@@ -95,7 +91,6 @@ public IDictionary Properties
}
}
-
internal delegate void ExporterFunc(object obj, JsonWriter writer);
public delegate void ExporterFunc(T obj, JsonWriter writer);
@@ -104,7 +99,6 @@ public IDictionary Properties
public delegate IJsonWrapper WrapperFactory();
-
public class JsonMapper
{
#region Fields
@@ -115,30 +109,25 @@ public class JsonMapper
private static IDictionary base_exporters_table;
private static IDictionary custom_exporters_table;
- private static IDictionary> base_importers_table;
- private static IDictionary> custom_importers_table;
+ private static IDictionary> base_importers_table;
+ private static IDictionary> custom_importers_table;
private static IDictionary array_metadata;
- private static readonly object array_metadata_lock = new Object();
+ private static readonly object array_metadata_lock = new object();
- private static IDictionary> conv_ops;
- private static readonly object conv_ops_lock = new Object();
+ private static IDictionary> conv_ops;
+ private static readonly object conv_ops_lock = new object();
private static IDictionary