j3g
/
picseal_pub
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

MOD: commnt code cleanup

This commit is contained in:
JohnE 2016-10-12 13:41:46 -07:00
parent 1898238955
commit 8938531449
2 changed files with 2 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libs/jpg_bin.py
View File

@ -148,15 +148,11 @@ class JpgBin:
# #
# #
def markerAppData(self, marker_hex): def markerAppData(self, marker_hex):
# fpos = self.fh.tell()
# self.jpg_fp.addImgMetadata(marker_hex, fpos, rec_len, "APP ")
self.__addPrevMarkerData(marker_hex, "APP ", False) self.__addPrevMarkerData(marker_hex, "APP ", False)
rec_len = self.__calcSeekBytes() rec_len = self.__calcSeekBytes()
# #
def markerComment(self, marker_hex): def markerComment(self, marker_hex):
# fpos = self.fh.tell()
# self.jpg_fp.addImgMetadata(marker_hex, fpos, rec_len, "COM ")
self.__addPrevMarkerData(marker_hex, "COM ", False) self.__addPrevMarkerData(marker_hex, "COM ", False)
rec_len = self.__calcSeekBytes() rec_len = self.__calcSeekBytes()
@ -165,7 +161,6 @@ class JpgBin:
# #
# #
def markerSOS(self, marker_hex): def markerSOS(self, marker_hex):
# rec_len = self.__calcSeekBytes()
self.__addPrevMarkerData(marker_hex, "SOS ") self.__addPrevMarkerData(marker_hex, "SOS ")
# #
@ -174,44 +169,31 @@ class JpgBin:
# #
def markerDQT(self, marker_hex): def markerDQT(self, marker_hex):
# fpos = self.fh.tell()
rec_len = self.__calcSeekBytes() rec_len = self.__calcSeekBytes()
# self.jpg_fp.addImgData(marker_hex, fpos, rec_len, "DQT ")
self.__addPrevMarkerData(marker_hex, "DQT ") self.__addPrevMarkerData(marker_hex, "DQT ")
# #
def markerDRI(self, marker_hex): def markerDRI(self, marker_hex):
# fpos = self.fh.tell()
# self.jpg_fp.addImgData(marker_hex, fpos, 4, "DRI ")
self.__addPrevMarkerData(marker_hex, "DRI ") self.__addPrevMarkerData(marker_hex, "DRI ")
# self.data_idx += 4
# #
def markerSOF0(self, marker_hex): def markerSOF0(self, marker_hex):
# fpos = self.fh.tell()
# self.jpg_fp.addImgData(marker_hex, fpos, rec_len, "SOF0")
self.__addPrevMarkerData(marker_hex, "SOF0") self.__addPrevMarkerData(marker_hex, "SOF0")
rec_len = self.__calcSeekBytes() rec_len = self.__calcSeekBytes()
# #
def markerSOF2(self, marker_hex): def markerSOF2(self, marker_hex):
# fpos = self.fh.tell()
# self.jpg_fp.addImgData(marker_hex, fpos, rec_len, "SOF2")
self.__addPrevMarkerData(marker_hex, "SOF2") self.__addPrevMarkerData(marker_hex, "SOF2")
rec_len = self.__calcSeekBytes() rec_len = self.__calcSeekBytes()
def markerDHT(self, marker_hex): def markerDHT(self, marker_hex):
# fpos = self.fh.tell()
# self.jpg_fp.addImgData(marker_hex, fpos, rec_len, "DHT ")
self.__addPrevMarkerData(marker_hex, "DHT ") self.__addPrevMarkerData(marker_hex, "DHT ")
rec_len = self.__calcSeekBytes() rec_len = self.__calcSeekBytes()
# #
def markerEOI(self, marker_hex): def markerEOI(self, marker_hex):
# fpos = self.fh.tell()
self.__addPrevMarkerData(marker_hex, "EOI ") self.__addPrevMarkerData(marker_hex, "EOI ")
self.__addPrevMarkerData(marker_hex, "JUST A DUMMY VALUE") self.__addPrevMarkerData(marker_hex, "JUST A DUMMY VALUE")
# self.jpg_fp.addImgData(marker_hex, fpos, 2, "EOI ")
# private helper function # private helper function
@ -250,13 +232,13 @@ class JpgBin:
remain_bytes = self.data_len - self.data_idx remain_bytes = self.data_len - self.data_idx
if (rec_len >= remain_bytes): if (rec_len >= remain_bytes):
rec_diff = rec_len - remain_bytes rec_diff = rec_len - remain_bytes
self.seekBytes(rec_diff) self.__seekBytes(rec_diff)
else: else:
self.data_idx += rec_len self.data_idx += rec_len
return rec_len return rec_len
# #
def seekBytes(self, num_bytes): def __seekBytes(self, num_bytes):
pos = self.fh.seek(num_bytes, 1) pos = self.fh.seek(num_bytes, 1)
self.__getMoreBytes(True) self.__getMoreBytes(True)
logging.debug("SEEK: seek=={}, cur_loc=={}".format(num_bytes, pos)) logging.debug("SEEK: seek=={}, cur_loc=={}".format(num_bytes, pos))

3
libs/jpg_fp.py
View File

@ -23,9 +23,6 @@ class JpgFingerprint:
# #
def printImgMarkers(self): def printImgMarkers(self):
# print ("Got here dummies")
# print ("len=={}".format(len(self.markers_img)))
# print ("*** *** *** ***\n{}".format(retstr))
return JpgFingerprint.__printMarker(self.markers_img) return JpgFingerprint.__printMarker(self.markers_img)
# #