Changeset 2135 for trunk/gui/src/RpDiffview.c
- Timestamp:
- Mar 14, 2011, 11:00:49 AM (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/gui/src/RpDiffview.c
r2132 r2135 1583 1583 - dvPtr->yOffset; 1584 1584 x = dvPtr->inset - dvPtr->xOffset; 1585 width = Tk_Width(tkwin); 1585 1586 if (Tk_Width(tkwin) > dvPtr->maxWidth) { 1587 width = Tk_Width(tkwin)+10; 1588 } else { 1589 width = dvPtr->maxWidth+10; 1590 } 1586 1591 1587 1592 for (i=dvPtr->topLine; … … 2346 2351 DiffviewLines *lineLimitsPtr; /* data structure being freed */ 2347 2352 { 2348 if (lineLimitsPtr->startPtr) { 2349 ckfree((char*)lineLimitsPtr->startPtr); 2350 } 2351 if (lineLimitsPtr->lenPtr) { 2352 ckfree((char*)lineLimitsPtr->lenPtr); 2353 } 2354 ckfree((char*)lineLimitsPtr); 2353 if (lineLimitsPtr) { 2354 if (lineLimitsPtr->startPtr) { 2355 ckfree((char*)lineLimitsPtr->startPtr); 2356 } 2357 if (lineLimitsPtr->lenPtr) { 2358 ckfree((char*)lineLimitsPtr->lenPtr); 2359 } 2360 ckfree((char*)lineLimitsPtr); 2361 } 2355 2362 } 2356 2363 … … 2594 2601 i++; j++; 2595 2602 } 2603 2604 /* lines left over? mark as many "changed" as possible */ 2605 if (limsPtr1->numLines-i > 0 && limsPtr2->numLines-j > 0) { 2606 del = (limsPtr1->numLines-i < limsPtr2->numLines-j) 2607 ? limsPtr1->numLines-i : limsPtr2->numLines-j; 2608 DiffviewDiffsAppend(diffPtr, 'c', i, i+del-1, j, j+del-1); 2609 i += del; 2610 j += del; 2611 } 2612 2613 /* still have lines left over? then mark them added or deleted */ 2596 2614 if (i < limsPtr1->numLines) { 2597 2615 del = limsPtr1->numLines - i;
Note: See TracChangeset
for help on using the changeset viewer.