Compared files  

Left
C:\SDK\wxWidgets-2.6.2\contrib\src\stc\scintilla\src\XPM.cxx
Last modified2004-09-28 13:17:26.001 +0200
Size6.8 Kb (317 Lines)
EncodingLatin 1 - ANSI (CP1252) default
Right
C:\SDK\wxWidgets-2.6.3\contrib\src\stc\scintilla\src\XPM.cxx
Last modified2006-03-16 13:07:08.000 +0100
Size6.9 Kb (323 Lines)
EncodingLatin 1 - ANSI (CP1252) default


   Comparison Statistics  

Detailed Statistics

All Changes
 BlocksLines
Unchanged3317
Inserted26
Deleted00
Ignored00
Changed00



   Comparison Details  

102 skipped lines
103 103     height = atoi(line0);
104 104     line0 = NextField(line0);
105 105     nColours = atoi(line0);
  106     line0 = NextField(line0);
  107     if (atoi(line0) != 1) {
  108         // Only one char per pixel is supported
  109         return;
  110     }
106 111     codes = new char[nColours];
107 112     colours = new ColourPair[nColours];
108 113  
152 skipped lines
261 266     for (int i = 0; i < len; i++) {
262 267         if (set[i]->GetId() == id) {
263 268         set[i]->Init(textForm);
  269         set[i]->CopyDesiredColours();
264 270         return;
265 271         }
266 272     }
51 skipped lines

   Text comparison Options  

Syntax colouring language used: C / C++
Match character case: yes.
Match line endings: no.
Match spaces

At start of lines: yes,
In middle of lines: yes,
At end of lines: yes.
Blank lines as empty lines: no.
Activate comparison algorithm
At word level: yes,
At character level: no.


   Legend  

Unchanged lineExample of unchanged line
Modified lineExample of modified line
Added lineExample of added line
Removed lineExample of removed line
Ignored lineExample of ignored line

This report has been generated by Ellié Computing Merge on 2006-09-07 15:48:35.001 +0200.
© 2005-2006 Ellié Computing http://www.elliecomputing.com. All rights reserved.