Merge branch 'master' of codecrew.fi:codecrew/moya into devel

code/MoyaEar/pom.xml

@@ -88,4 +88,12 @@
 		
 		
 
 
 	</dependencies>
 	</dependencies>
+
+	<repositories>
+		<repository>
+			<id>jvnet-nexus-releases</id>
+			<name>jvnet-nexus-releases</name>
+			<url>https://maven.java.net/content/repositories/releases/</url>
+		</repository>
+	</repositories>
 </project>
 </project>
\ No newline at end of file

code/MoyaUtilities/src/main/java/fi/codecrew/moya/utilities/JpegReader.java

@@ -74,11 +74,11 @@ public class JpegReader {
 		List<Segment> segments = parser.readSegments(byteSource, new int[] { 0xffee }, true);
 		List<Segment> segments = parser.readSegments(byteSource, new int[] { 0xffee }, true);
 		if (segments != null && segments.size() >= 1) {
 		if (segments != null && segments.size() >= 1) {
 			UnknownSegment app14Segment = (UnknownSegment) segments.get(0);
 			UnknownSegment app14Segment = (UnknownSegment) segments.get(0);
-			byte[] data = app14Segment.bytes;
+			byte[] data = app14Segment.getSegmentData();
 			if (data.length >= 12 && data[0] == 'A' && data[1] == 'd' && data[2] == 'o' && data[3] == 'b' && data[4] == 'e')
 			if (data.length >= 12 && data[0] == 'A' && data[1] == 'd' && data[2] == 'o' && data[3] == 'b' && data[4] == 'e')
 			{
 			{
 				hasAdobeMarker = true;
 				hasAdobeMarker = true;
-				int transform = app14Segment.bytes[11] & 0xff;
+				int transform = data[11] & 0xff;
 				if (transform == 2)
 				if (transform == 2)
 					colorType = COLOR_TYPE_YCCK;
 					colorType = COLOR_TYPE_YCCK;
 			}
 			}

code/MoyaWeb/.classpath

@@ -22,5 +22,6 @@
 			<attribute name="owner.project.facets" value="jst.web"/>
 			<attribute name="owner.project.facets" value="jst.web"/>
 		</attributes>
 		</attributes>
 	</classpathentry>
 	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
 	<classpathentry kind="output" path="target/classes"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
 </classpath>