3 Commits
Author SHA1 Message Date
ari d74bf1eaa9 - added support for ICCSBAsed colors 2018-11-09 10:24:04 -05:00
ari cf3c89bf25 supporting ICCSBased colors 2018-11-09 10:22:44 -05:00
ari b491cd2181 - v1.1.8 2018-11-08 14:53:28 -05:00
6 changed files with 48 additions and 8 deletions

No files matched your search

+1 -1
View File
@@ -1 +1 @@
v1.1.7
v1.1.9
+1 -1
View File
@@ -86,7 +86,7 @@ OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
"""
__version__ = (1, 1, 7)
__version__ = (1, 1, 9)
if __name__ == '__main__':
print(
+1 -1
View File
@@ -33,7 +33,7 @@ def get_color(col: PDFGraphicStateColor):
return f'gray({color_val})'
elif color_type == "custom":
# Todo: convert these to more friendly color types
return f"custom({col.custom['type']})"
return f"{col.custom['type']}({col.custom['defintion']})"
return ""
FIRST_CAP_RE = re.compile('(.)([A-Z][a-z]+)')
+43 -3
View File
@@ -351,6 +351,24 @@ class PDFPageInterpreter(object):
#self.do_cs(LITERAL_DEVICE_CMYK)
return
def __process_ICCBased(self, n: int, components: list):
if n == 1:
return {
"type": "gray",
"definition": components
}
elif n == 3:
return {
"type": "rgb",
"definition": components
}
elif n == 4:
return {
"type": "cmyk",
"definition": components
}
raise PDFInterpreterError("Unsupported ICCBased color")
# setcolor
def __process_scn(self):
if self.ncs:
@@ -359,8 +377,14 @@ class PDFPageInterpreter(object):
raise PDFInterpreterError('No colorspace specified!')
components = self.pop(n)
obj_id = components[0]
if self.ncs.name == "ICCBased":
return self.__process_ICCBased(n, components)
if self.ncs.name not in self.resources.keys():
raise PDFInterpreterError("Color space not in resources")
log.warning("Color space not in resources")
return {
"type": self.ncs.name,
"defintion": f"{n}|({','.join(map(str, components))})"
}
if obj_id.name not in self.resources[self.ncs.name].keys():
raise PDFInterpreterError("Invalid Color reference")
@@ -374,11 +398,27 @@ class PDFPageInterpreter(object):
"defintion": color_data
}
def do_SCN(self):
self.graphicstate.scolor.custom = self.__process_scn()
processed_col = self.__process_scn()
if processed_col['type'] == 'rgb':
self.graphicstate.scolor.rgb = processed_col['definition']
elif processed_col['type'] == 'gray':
self.graphicstate.scolor.gray = processed_col['definition'][0]
elif processed_col['type'] == 'cmyk':
self.graphicstate.scolor.cmyk = processed_col['definition']
else:
self.graphicstate.scolor.custom = processed_col
return
def do_scn(self):
self.graphicstate.ncolor.custom = self.__process_scn()
processed_col = self.__process_scn()
if processed_col['type'] == 'rgb':
self.graphicstate.ncolor.rgb = processed_col['definition']
elif processed_col['type'] == 'gray':
self.graphicstate.ncolor.gray = processed_col['definition'][0]
elif processed_col['type'] == 'cmyk':
self.graphicstate.ncolor.cmyk = processed_col['definition']
else:
self.graphicstate.ncolor.custom = processed_col
return
def do_SC(self):
+1 -1
View File
@@ -8,7 +8,7 @@ from xml.etree import ElementTree
def rel_path(*arg: List[str]) -> str:
return os.path.join(os.path.dirname(__file__), *arg)
EXT = 'xml'
EXT = 'html'
INPUT_FOLDER = rel_path("./pdf")
OUTPUT_FOLDER = rel_path(f"./output/{EXT}")
+1 -1
View File
@@ -10,7 +10,7 @@ import sys
with open('README.md') as readme_file:
SETUP = {
"name": "pdfmajor",
"version": "1.1.7",
"version": "1.1.9",
"packages": find_packages(include=['pdfmajor*']),
"install_requires": [
'pycryptodome',