htmlrenderer bug

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@65879 954022d7-b5bf-4e40-9824-e11837661b57

HtmlRenderer/htmlrenderer.pro

@@ -44,6 +44,10 @@ linux-g++:!contains(QMAKE_HOST.arch, x86_64):{
     DESTDIR = $$DESTINATION_SDK_PATH/linux_32
 }
 
+mac {
+    DESTDIR = $$DESTINATION_SDK_PATH/mac_64
+}
+
 ################################################
 
 ############# dynamic dependencies #############
@@ -79,6 +83,13 @@ shared {
 
         TARGET_EXT = .so
     }
+
+    mac {
+        CONFIG += plugin
+
+        QMAKE_CXXFLAGS += -fvisibility=hidden
+        QMAKE_CFLAGS += -fvisibility=hidden
+    }
 } else {
     LIBS += -L$$DESTDIR -llibxml
 }
@@ -100,6 +111,17 @@ linux-g++ | linux-g++-64 | linux-g++-32 {
         _LINUX_QT
 }
 
+mac {
+    DEFINES += \
+    HAVE_UNISTD_H \
+    LINUX \
+    _LINUX \
+    _MAC \
+    MAC
+
+    message(mac)
+}
+
 ##################################################
 
 INCLUDEPATH += \

HtmlRenderer/src/SVGWriter2.h

@@ -105,14 +105,14 @@ namespace NSHtmlRenderer
 		{
 			// определ¤ем размеры картинки
 			if (NULL == m_pFrame)
-				return NULL;
+				return;
 
             BYTE* pBuffer = m_pFrame->get_Data();
 
 			RECT rect = GetImageBounds(m_pFrame);
 
 			if (((rect.right - rect.left) < 5) && ((rect.bottom - rect.top) < 5))
-				return NULL;
+				return;
 
 			BYTE* pBufferSrcMem = pBuffer + 4 * rect.top * m_lWidthPix + 4 * rect.left;
 			LONG lWidthShape	= rect.right - rect.left + 1;