Skip to content
This repository has been archived by the owner on Sep 1, 2022. It is now read-only.

Commit

Permalink
Upgrade to "edu.ucar:jj2000:5.3-SNAPSHOT".
Browse files Browse the repository at this point in the history
* All of the classes we use from that dependency are now in different packages.
  • Loading branch information
cwardgar committed Jun 2, 2015
1 parent 2c74bf9 commit 594fddc
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion gradle/dependencies.gradle
Expand Up @@ -147,7 +147,7 @@ libraries["commons-lang3"] = "org.apache.commons:commons-lang3:3.3.2"

libraries["guava"] = "com.google.guava:guava:18.0"

libraries["jj2000"] = "edu.ucar:jj2000:5.2"
libraries["jj2000"] = "edu.ucar:jj2000:5.3-SNAPSHOT"

libraries["xz"] = "org.tukaani:xz:1.0"

Expand Down
36 changes: 18 additions & 18 deletions grib/src/main/java/ucar/nc2/grib/grib2/Grib2JpegDecoder.java
Expand Up @@ -32,22 +32,22 @@
*/
package ucar.nc2.grib.grib2;

import jj2000.j2k.quantization.dequantizer.*;
import jj2000.j2k.image.invcomptransf.*;
import jj2000.j2k.fileformat.reader.*;
import jj2000.j2k.codestream.reader.*;
import jj2000.j2k.wavelet.synthesis.*;
import jj2000.j2k.entropy.decoder.*;
import jj2000.j2k.decoder.*;
import jj2000.j2k.image.output.*;
import jj2000.j2k.codestream.*;
import jj2000.j2k.image.*;
import jj2000.j2k.util.*;
import jj2000.j2k.roi.*;
import jj2000.j2k.io.*;

import colorspace.*;
import icc.*;
import ucar.jpeg.jj2000.j2k.quantization.dequantizer.*;
import ucar.jpeg.jj2000.j2k.image.invcomptransf.*;
import ucar.jpeg.jj2000.j2k.fileformat.reader.*;
import ucar.jpeg.jj2000.j2k.codestream.reader.*;
import ucar.jpeg.jj2000.j2k.wavelet.synthesis.*;
import ucar.jpeg.jj2000.j2k.entropy.decoder.*;
import ucar.jpeg.jj2000.j2k.decoder.*;
import ucar.jpeg.jj2000.j2k.image.output.*;
import ucar.jpeg.jj2000.j2k.codestream.*;
import ucar.jpeg.jj2000.j2k.image.*;
import ucar.jpeg.jj2000.j2k.util.*;
import ucar.jpeg.jj2000.j2k.roi.*;
import ucar.jpeg.jj2000.j2k.io.*;

import ucar.jpeg.colorspace.*;
import ucar.jpeg.icc.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down Expand Up @@ -442,7 +442,7 @@ public static String[][] getAllParameters() {
str = ICCProfiler.getParameterInfo();
if (str != null) for (i = str.length - 1; i >= 0; i--) vec.add(str[i]);

str = jj2000.j2k.decoder.Decoder.getParameterInfo();
str = ucar.jpeg.jj2000.j2k.decoder.Decoder.getParameterInfo();
if (str != null) for (i = str.length - 1; i >= 0; i--) vec.add(str[i]);

String[][] result = new String[vec.size()][];
Expand Down Expand Up @@ -670,4 +670,4 @@ public String toString() {
}
} // end ImgWriterArray

} // end Grib2JpegDecoder
} // end Grib2JpegDecoder

0 comments on commit 594fddc

Please sign in to comment.