From bcf7e23fc2ddd06f790648e2fa92796ad7c0999f Mon Sep 17 00:00:00 2001
From: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date: Mon, 28 Sep 2009 14:59:39 +0000
Subject: [PATCH] confirm if text extraction works fine for CMYK images.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@29233 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 product/ERP5OOo/tests/testDms.py                 |   7 +++++++
 .../ERP5OOo/tests/test_document/cmyk_sample.jpg  | Bin 0 -> 5019 bytes
 2 files changed, 7 insertions(+)
 create mode 100644 product/ERP5OOo/tests/test_document/cmyk_sample.jpg

diff --git a/product/ERP5OOo/tests/testDms.py b/product/ERP5OOo/tests/testDms.py
index 8682b8a1f8..edf380de93 100644
--- a/product/ERP5OOo/tests/testDms.py
+++ b/product/ERP5OOo/tests/testDms.py
@@ -802,6 +802,13 @@ class TestDocument(ERP5TypeTestCase, ZopeTestCase.Functional):
     document.edit(file=upload_file)
     self.assertEquals('application/pdf', document.getContentType())
 
+  def test_CMYKImageTextContent(self):
+    upload_file = makeFileUpload('cmyk_sample.jpg')
+    document = self.portal.portal_contributions.newContent(file=upload_file)
+    self.assertEquals('Image', document.getPortalType())
+    self.assertEquals('ERP5 is a free software.\n',
+                      document.SearchableText())
+
 class TestDocumentWithSecurity(ERP5TypeTestCase):
 
   username = 'yusei'
diff --git a/product/ERP5OOo/tests/test_document/cmyk_sample.jpg b/product/ERP5OOo/tests/test_document/cmyk_sample.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..92a8a0401e2c22b7645dea73de517a10e4888f80
GIT binary patch
literal 5019
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
ZbQ4N?(_L@#5;$A_AKelCpBVI*@!yd>Sjzwa

literal 0
HcmV?d00001

-- 
2.30.9