From b44664bcccaf65eb8f5b01b808174155b52a3885 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Sun, 24 Jun 2012 11:35:46 +0000 Subject: [PATCH] Merge V4.1-BUG-FIX (4.1.1) to HEAD 38252: Merge V3.4-BUG-FIX (3.4.11) to V4.1-BUG-FIX (4.1.1) 38251: ALF-14340 CLONE: Alfresco crashes when viewing doclib / previewing - PDF with CMap - Fix build failure on 4.1.1 and HEAD - ImageMagick must be used for resize, crop, rotate AND only once Would also be a problem on 3.4.11 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@38254 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- config/alfresco/content-services-context.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/alfresco/content-services-context.xml b/config/alfresco/content-services-context.xml index fbfba3e1b4..13bab27fa4 100644 --- a/config/alfresco/content-services-context.xml +++ b/config/alfresco/content-services-context.xml @@ -972,6 +972,10 @@ + + image/png + image/png + application/pdf image/png