Attachment #151054 for bug #196342

View | Details | Raw Unified | Return to bug 196342
Collapse All | Expand All

Lines 2-8 Link Here

(-)Makefile (-1 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= doxygen	4	PORTNAME= doxygen
5	PORTVERSION= 1.8.8	5	PORTVERSION= 1.8.9
6	PORTEPOCH= 2	6	PORTEPOCH= 2
7	CATEGORIES= devel	7	CATEGORIES= devel
8	MASTER_SITES= ftp://ftp.stack.nl/pub/users/dimitri/ \	8	MASTER_SITES= ftp://ftp.stack.nl/pub/users/dimitri/ \

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (doxygen-1.8.8.src.tar.gz) = 158e7834f05e0aeea5794b23c1e775ddfebafc709543e47f6fff9d81b190ade1	1	SHA256 (doxygen-1.8.9.src.tar.gz) = f0dd662fb98c394c20deed5b00b29d73d9bee8ea1a52f7a687dd9b70f5444fc6
2	SIZE (doxygen-1.8.8.src.tar.gz) = 4955485	2	SIZE (doxygen-1.8.9.src.tar.gz) = 5006046




--- src/dot.cpp.orig	2014-12-25 12:44:06 UTC
+++ src/dot.cpp
@@ -39,6 +39,7 @@
 #include "dirdef.h"
 #include "vhdldocgen.h"
 #include "ftextstream.h"

 #include "md5.h"
 #include "memberlist.h"
 #include "groupdef.h"
@@ -2297,10 +2298,8 @@ void DotGfxHierarchyTable::createGraph(D
   }
   writeGraphFooter(md5stream);
   resetReNumbering();
-  uchar md5_sig[16];
   QCString sigStr(33);
-  MD5Buffer((const unsigned char *)theGraph.data(),theGraph.length(),md5_sig);
-  MD5SigToString(md5_sig,sigStr.data(),33);
+  MD5Data((const unsigned char *)theGraph.data(),theGraph.length(),sigStr.data());
   bool regenerate=FALSE;
   if (checkAndUpdateMd5Signature(absBaseName,sigStr) || 
       !checkDeliverables(absImgName,absMapName))
@@ -3025,10 +3024,8 @@ QCString computeMd5Signature(DotNode *ro
     }
     writeGraphFooter(md5stream);
     resetReNumbering();
-    uchar md5_sig[16];
     QCString sigStr(33);
-    MD5Buffer((const unsigned char *)theGraph.data(),theGraph.length(),md5_sig);
-    MD5SigToString(md5_sig,sigStr.data(),33);
+    MD5Data((const unsigned char *)theGraph.data(),theGraph.length(),sigStr.data());
     bool regenerate=FALSE;
     if (checkAndUpdateMd5Signature(absBaseName,sigStr) || 
         !checkDeliverables(absImgName,absMapName))
@@ -3021,10 +3020,8 @@
     }
   }
   writeGraphFooter(md5stream);
-  uchar md5_sig[16];

   if (reNumber)
   {
     resetReNumbering();
@@ -3959,10 +3956,8 @@ QCString DotDirDeps::writeGraph(FTextStr
   QGString theGraph;
   FTextStream md5stream(&theGraph);
   m_dir->writeDepGraph(md5stream);

+  MD5Data((const unsigned char *)theGraph.data(),theGraph.length(),sigStr.data());
   bool regenerate=FALSE;
   if (checkAndUpdateMd5Signature(absBaseName,sigStr) ||
       !checkDeliverables(graphFormat==GOF_BITMAP ? absImgName :
@@ -4105,10 +4100,8 @@ void generateGraphLegend(const char *pat
   md5stream << "  Node18 -> Node9 [dir=\"back\",color=\"darkorchid3\",fontsize=\"" << FONTSIZE << "\",style=\"dashed\",label=\"m_usedClass\",fontname=\"" << FONTNAME << "\"];\n";
   md5stream << "  Node18 [shape=\"box\",label=\"Used\",fontsize=\"" << FONTSIZE << "\",height=0.2,width=0.4,fontname=\"" << FONTNAME << "\",color=\"black\",URL=\"$classUsed" << Doxygen::htmlFileExtension << "\"];\n";
   writeGraphFooter(md5stream);

   QCString absBaseName = (QCString)path+"/graph_legend";
   QCString absDotName  = absBaseName+".dot";
   QCString imgExt      = Config_getEnum("DOT_IMAGE_FORMAT");
@@ -4505,10 +4498,8 @@ QCString DotGroupCollaboration::writeGra
 
   writeGraphFooter(md5stream);
   resetReNumbering();

Return to bug 196342

Lines 1-6 Link Here

(-)files/patch-md5-dot (-20 / +20 lines)
1	--- src/dot.cpp-orig 2014-06-11 20:13:39.000000000 +0200	1	--- src/dot.cpp.orig 2014-12-25 12:44:06 UTC
2	+++ src/dot.cpp 2014-06-11 20:15:32.000000000 +0200	2	+++ src/dot.cpp
3	@@ -44,6 +44,7 @@	3	@@ -39,6 +39,7 @@
4	#include "dirdef.h"	4	#include "dirdef.h"
5	#include "vhdldocgen.h"	5	#include "vhdldocgen.h"
6	#include "ftextstream.h"	6	#include "ftextstream.h"
Lines 8-27 Link Here
8	#include "md5.h"	8	#include "md5.h"
9	#include "memberlist.h"	9	#include "memberlist.h"
10	#include "groupdef.h"	10	#include "groupdef.h"
11	@@ -2318,10 +2319,8 @@	11	@@ -2297,10 +2298,8 @@ void DotGfxHierarchyTable::createGraph(D
		12	}
		13	writeGraphFooter(md5stream);
		14	resetReNumbering();
		15	- uchar md5_sig[16];
		16	QCString sigStr(33);
		17	- MD5Buffer((const unsigned char *)theGraph.data(),theGraph.length(),md5_sig);
		18	- MD5SigToString(md5_sig,sigStr.data(),33);
		19	+ MD5Data((const unsigned char *)theGraph.data(),theGraph.length(),sigStr.data());
		20	bool regenerate=FALSE;
		21	if (checkAndUpdateMd5Signature(absBaseName,sigStr) \|\|
		22	!checkDeliverables(absImgName,absMapName))
		23	@@ -3025,10 +3024,8 @@ QCString computeMd5Signature(DotNode *ro
12	}	24	}
13	writeGraphFooter(md5stream);
14	resetReNumbering();
15	- uchar md5_sig[16];
16	QCString sigStr(33);
17	- MD5Buffer((const unsigned char *)theGraph.data(),theGraph.length(),md5_sig);
18	- MD5SigToString(md5_sig,sigStr.data(),33);
19	+ MD5Data((const unsigned char *)theGraph.data(),theGraph.length(),sigStr.data());
20	bool regenerate=FALSE;
21	if (checkAndUpdateMd5Signature(absBaseName,sigStr) \|\|
22	!checkDeliverables(absImgName,absMapName))
23	@@ -3021,10 +3020,8 @@
24	}
25	}	25	}
26	writeGraphFooter(md5stream);	26	writeGraphFooter(md5stream);
27	- uchar md5_sig[16];	27	- uchar md5_sig[16];
Lines 32-38 Link Here
32	if (reNumber)	32	if (reNumber)
33	{	33	{
34	resetReNumbering();	34	resetReNumbering();
35	@@ -3895,10 +3892,8 @@	35	@@ -3959,10 +3956,8 @@ QCString DotDirDeps::writeGraph(FTextStr
36	QGString theGraph;	36	QGString theGraph;
37	FTextStream md5stream(&theGraph);	37	FTextStream md5stream(&theGraph);
38	m_dir->writeDepGraph(md5stream);	38	m_dir->writeDepGraph(md5stream);
Lines 43-50 Link Here
43	+ MD5Data((const unsigned char *)theGraph.data(),theGraph.length(),sigStr.data());	43	+ MD5Data((const unsigned char *)theGraph.data(),theGraph.length(),sigStr.data());
44	bool regenerate=FALSE;	44	bool regenerate=FALSE;
45	if (checkAndUpdateMd5Signature(absBaseName,sigStr) \|\|	45	if (checkAndUpdateMd5Signature(absBaseName,sigStr) \|\|
46	!checkDeliverables(format==BITMAP ? absImgName :	46	!checkDeliverables(graphFormat==GOF_BITMAP ? absImgName :
47	@@ -4025,10 +4020,8 @@	47	@@ -4105,10 +4100,8 @@ void generateGraphLegend(const char *pat
48	md5stream << " Node18 -> Node9 [dir=\"back\",color=\"darkorchid3\",fontsize=\"" << FONTSIZE << "\",style=\"dashed\",label=\"m_usedClass\",fontname=\"" << FONTNAME << "\"];\n";	48	md5stream << " Node18 -> Node9 [dir=\"back\",color=\"darkorchid3\",fontsize=\"" << FONTSIZE << "\",style=\"dashed\",label=\"m_usedClass\",fontname=\"" << FONTNAME << "\"];\n";
49	md5stream << " Node18 [shape=\"box\",label=\"Used\",fontsize=\"" << FONTSIZE << "\",height=0.2,width=0.4,fontname=\"" << FONTNAME << "\",color=\"black\",URL=\"$classUsed" << Doxygen::htmlFileExtension << "\"];\n";	49	md5stream << " Node18 [shape=\"box\",label=\"Used\",fontsize=\"" << FONTSIZE << "\",height=0.2,width=0.4,fontname=\"" << FONTNAME << "\",color=\"black\",URL=\"$classUsed" << Doxygen::htmlFileExtension << "\"];\n";
50	writeGraphFooter(md5stream);	50	writeGraphFooter(md5stream);
Lines 56-62 Link Here
56	QCString absBaseName = (QCString)path+"/graph_legend";	56	QCString absBaseName = (QCString)path+"/graph_legend";
57	QCString absDotName = absBaseName+".dot";	57	QCString absDotName = absBaseName+".dot";
58	QCString imgExt = Config_getEnum("DOT_IMAGE_FORMAT");	58	QCString imgExt = Config_getEnum("DOT_IMAGE_FORMAT");
59	@@ -4424,10 +4417,8 @@	59	@@ -4505,10 +4498,8 @@ QCString DotGroupCollaboration::writeGra
60		60
61	writeGraphFooter(md5stream);	61	writeGraphFooter(md5stream);
62	resetReNumbering();	62	resetReNumbering();