Author: toad
Date: 2008-02-15 14:04:55 +0000 (Fri, 15 Feb 2008)
New Revision: 17938
Modified:
trunk/freenet/src/freenet/clients/http/filter/JPEGFilter.java
Log:
indenting
Modified: trunk/freenet/src/freenet/clients/http/filter/JPEGFilter.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/filter/JPEGFilter.java
2008-02-15 14:04:17 UTC (rev 17937)
+++ trunk/freenet/src/freenet/clients/http/filter/JPEGFilter.java
2008-02-15 14:04:55 UTC (rev 17938)
@@ -317,30 +317,30 @@
valid = true;
}
if(valid) {
- // Essential, non-terminal, but
unparsed frames.
- if(blockLength < 2)
- throwError("Invalid frame
length", "The file includes an invalid frame (length "+blockLength+").");
- if(dos != null) {
- byte[] buf = new
byte[blockLength - 2];
- dis.readFully(buf);
- dos.write(buf);
- } else
+ // Essential, non-terminal, but
unparsed frames.
+ if(blockLength < 2)
+ throwError("Invalid
frame length", "The file includes an invalid frame (length "+blockLength+").");
+ if(dos != null) {
+ byte[] buf = new
byte[blockLength - 2];
+ dis.readFully(buf);
+ dos.write(buf);
+ } else
+ skipBytes(dis,
blockLength - 2);
+ Logger.minor(this, "Essential
frame type "+Integer.toHexString(markerType)+" length "+(blockLength-2)+"
offset at end "+cis.count());
+ } else {
+ if(markerType >= 0xE0 &&
markerType <= 0xEF) {
+ // APP marker. Can be
safely deleted.
+ if(logMINOR)
+
Logger.minor(this, "Dropping application marker type
"+Integer.toHexString(markerType)+" length "+blockLength);
+ } else {
+ if(logMINOR)
+
Logger.minor(this, "Dropping unknown frame type
"+Integer.toHexString(markerType)+" blockLength");
+ }
+ // Delete frame
skipBytes(dis, blockLength - 2);
- Logger.minor(this, "Essential frame
type "+Integer.toHexString(markerType)+" length "+(blockLength-2)+" offset at
end "+cis.count());
- } else {
- if(markerType >= 0xE0 && markerType <=
0xEF) {
- // APP marker. Can be safely
deleted.
- if(logMINOR)
- Logger.minor(this,
"Dropping application marker type "+Integer.toHexString(markerType)+" length
"+blockLength);
- } else {
- if(logMINOR)
- Logger.minor(this,
"Dropping unknown frame type "+Integer.toHexString(markerType)+" blockLength");
+ continue;
}
- // Delete frame
- skipBytes(dis, blockLength - 2);
- continue;
}
- }
if(cis.count() != countAtStart + blockLength)
throwError("Invalid frame", "The length
of the frame is incorrect (read "+
