OpenSystemsDevelopment / qpdf

Commit 3356b6708d72688831a62d0928345fb07f2d785e

Authored by Jay Berkenbilt
1 parent f0211d95

revert /Crypt filter support -- I seemed to have misinterpreted it 


git-svn-id: svn+q:///qpdf/trunk@822 71b93d88-0707-0410-a8cf-f5a4172ac649
Inline Side-by-side
Showing 1 changed file with 2 additions and 12 deletions
libqpdf/QPDF_Stream.cc
  View file @3356b67
@@ -136,11 +136,6 @@ QPDF_Stream::filterable(std::vector<std::string>& filters, @@ -136,11 +136,6 @@ QPDF_Stream::filterable(std::vector<std::string>& filters,
136 filterable = false; 136 filterable = false;
137 } 137 }
138 } 138 }
139 - else if (key == "/Crypt")  
140 - {  
141 - // XXX untested  
142 - // we handle this in decryptStream  
143 - }  
144 else 139 else
145 { 140 {
146 filterable = false; 141 filterable = false;
@@ -217,8 +212,7 @@ QPDF_Stream::filterable(std::vector<std::string>& filters, @@ -217,8 +212,7 @@ QPDF_Stream::filterable(std::vector<std::string>& filters,
217 iter != filters.end(); ++iter) 212 iter != filters.end(); ++iter)
218 { 213 {
219 std::string const& filter = *iter; 214 std::string const& filter = *iter;
220 - if (! ((filter == "/Crypt") ||  
221 - (filter == "/FlateDecode") || 215 + if (! ((filter == "/FlateDecode") ||
222 (filter == "/LZWDecode") || 216 (filter == "/LZWDecode") ||
223 (filter == "/ASCII85Decode") || 217 (filter == "/ASCII85Decode") ||
224 (filter == "/ASCIIHexDecode"))) 218 (filter == "/ASCIIHexDecode")))
@@ -272,11 +266,7 @@ QPDF_Stream::pipeStreamData(Pipeline* pipeline, bool filter, @@ -272,11 +266,7 @@ QPDF_Stream::pipeStreamData(Pipeline* pipeline, bool filter,
272 iter != filters.rend(); ++iter) 266 iter != filters.rend(); ++iter)
273 { 267 {
274 std::string const& filter = *iter; 268 std::string const& filter = *iter;
275 - if (filter == "/Crypt")  
276 - {  
277 - // Ignore -- handled by pipeStreamData  
278 - }  
279 - else if (filter == "/FlateDecode") 269 + if (filter == "/FlateDecode")
280 { 270 {
281 if (predictor == 12) 271 if (predictor == 12)
282 { 272 {