DELTA 24422 0 755
SVN  ÏGØFˆ~ ž'  „ž2€ˆ{ ˜c¢0ƒ G  “i»^image_surface_get_format(new->surface) == CAIRO_FORMAT_RGB24) {
    /* Make format right */
    cairo_surface_t *tmp;
    int width = cairo_image_surface_get_width(new->surface);
    int height = cairo_image_surface_get_height(new->surface);
    unsigned char *old_data;
    unsigned char *new_data;
    int i, j;

    /* Surface with correct format */
    tmp = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, width, height);

    old_data = cairo_image_surface_get_data(new->surface);
    new_data = cairo_image_surface_get_data(tmp);

    for (i = 0; i < width; i++) {
      for (j = 0; j < height; j++) {
        /* Add alpha channel */
        new_data[(j * width + i) * 4] = 0xff;
        /* Copy RGB */
        new_data[(j * width + i) * 4 + 1] = old_data[(j * width + i) * 4 + 1];
        new_data[(j * width + i) * 4 + 2] = old_data[(j * width + i) * 4 + 2];
        new_data[(j * width + i) * 4 + 3] = old_data[(j * width + i) * 4 + 3];
      }
    }

    cairo_surface_mark_dirty(tmp);
    cairo_surface_destroy(new->surface);

    new->surface = tmp;
  }

  fc_assert(cairo_image_surface_get_format(new->surface) == CAIRO_FORMAT_ARGB32}

ENDREP
id: 2y8.5ik.r25901/1213
type: file
pred: 2y8.5ik.r24482/45
count: 14
text: 25901 0 1188 11334 ed3d41ccf878f6f82cba51bf3bb79a7a
props: 10141 28046 110 0 2a94ed7a58fe1feebaea27ee0c48460d
cpath: /branches/S2_4/client/gui-gtk-3.0/sprite.c
copyroot: 19694 /trunk/client/gui-gtk-3.0

PLAIN
K 11
Makefile.am
V 24
file zu.5ik.r21621/16826
K 8
canvas.c
V 24
file 2y6.5ik.r22539/6873
K 8
canvas.h
V 24
file 2y7.5ik.r22534/2799
K 16
caravan_dialog.c
V 25
file 376.5g7.r19878/19470
K 10
chatline.c
V 23
file zw.5ik.r25826/2335
K 10
chatline.h
V 23
file zx.5ik.r25826/2617
K 15
choice_dialog.c
V 23
file 377.5ik.r22570/922
K 15
choice_dialog.h
V 23
file 378.0.r12670/99360
K 14
citizensinfo.c
V 24
file 6n1.5ik.r23658/1645
K 14
citizensinfo.h
V 24
file 6n2.5ck.r19130/7932
K 9
citydlg.c
V 22
file zy.5ik.r25692/863
K 9
citydlg.h
V 20
file zz.0.r5493/6351
K 9
cityrep.c
V 23
file 100.5ik.r23710/362
K 9
cityrep.h
V 25
file 101.5ck.r18101/91562
K 8
cma_fe.c
V 24
file 102.5ik.r22557/5108
K 8
cma_fe.h
V 25
file 103.5ik.r22541/12037
K 8
colors.c
V 24
file 104.5ik.r22539/7721
K 8
colors.h
V 24
file 105.5ik.r22539/8001
K 12
connectdlg.c
V 25
file 106.5ck.r19683/48662
K 12
connectdlg.h
V 25
file 107.5ck.r19154/49180
K 9
dialogs.c
V 24
file 108.5ik.r22585/7502
K 9
dialogs.h
V 25
file 109.5g7.r20375/32516
K 10
diplodlg.c
V 25
file 10a.5ik.r24249/12008
K 10
diplodlg.h
V 23
file 10b.0.r9577/108261
K 17
diplomat_dialog.c
V 24
file 36n.5ik.r22575/2057
K 9
editgui.c
V 25
file 4ej.5ik.r24249/11782
K 9
editgui.h
V 25
file 4ek.5ck.r19385/16755
K 10
editprop.c
V 24
file 4el.5ik.r25184/5160
K 10
editprop.h
V 26
file 3bj.5cl.r18452/125612
K 10
embedggz.c
V 26
file 4gq.5ck.r19259/430259
K 9
finddlg.c
V 23
file 10c.5ik.r24965/157
K 9
finddlg.h
V 22
file 2d0.0.r5989/22356
K 10
gamedlgs.c
V 24
file 10d.5ik.r22762/4816
K 9
gotodlg.c
V 25
file 10e.5ik.r24414/11158
K 9
gotodlg.h
V 25
file 10f.5ck.r19505/20989
K 10
graphics.c
V 24
file 10g.5ik.r22526/6062
K 10
graphics.h
V 24
file 10h.5ik.r22526/6344
K 12
gtkpixcomm.c
V 25
file 10i.5ik.r21621/16542
K 12
gtkpixcomm.h
V 24
file 10j.5ik.r21588/1506
K 10
gui_main.c
V 24
file 10k.5ik.r25870/6769
K 10
gui_main.h
V 25
file 10l.5ik.r24710/10833
K 11
gui_stuff.c
V 24
file 10m.5ik.r22585/6423
K 11
gui_stuff.h
V 25
file 10n.5ik.r22001/12148
K 11
happiness.c
V 25
file 10o.5ik.r22555/11284
K 11
happiness.h
V 23
file 10p.0.r9577/106064
K 9
helpdlg.c
V 25
file 10q.5ik.r25358/16779
K 9
helpdlg.h
V 23
file 10r.0.r4313/267882
K 10
inputdlg.c
V 25
file 10s.5ik.r20465/72310
K 10
inputdlg.h
V 24
file 10t.5ck.r19651/6762
K 10
inteldlg.c
V 23
file 10u.5ik.r22559/722
K 10
inteldlg.h
V 23
file 2d1.0.r9577/108626
K 12
luaconsole.c
V 24
file 76e.5ik.r25822/5332
K 12
luaconsole.h
V 25
file 76f.5g7.r20310/10019
K 9
mapctrl.c
V 23
file 10v.5ik.r22944/707
K 9
mapctrl.h
V 23
file 10w.5ik.r22547/555
K 9
mapview.c
V 24
file 10x.5ik.r25642/5126
K 9
mapview.h
V 25
file 10y.5ik.r21621/14312
K 6
menu.c
V 25
file 10z.5ik.r23644/78895
K 6
menu.h
V 25
file 110.5ck.r16067/65085
K 12
messagedlg.c
V 24
file 111.5ik.r22585/8915
K 12
messagedlg.h
V 22
file 2d2.0.r5989/22693
K 12
messagewin.c
V 24
file 112.5ik.r22585/6708
K 12
messagewin.h
V 25
file 113.5ck.r18082/27153
K 11
optiondlg.c
V 25
file 4js.5ik.r23550/17063
K 11
optiondlg.h
V 25
file 114.5ck.r17037/29773
K 7
pages.c
V 24
file 2pi.5il.r25246/5041
K 7
pages.h
V 25
file 2pj.5ik.r23550/17585
K 8
plrdlg.c
V 25
file 115.5ik.r24249/12291
K 8
plrdlg.h
V 22
file 116.0.r10803/7069
K 10
ratesdlg.h
V 22
file 2d3.0.r5989/22018
K 10
repodlgs.c
V 25
file 118.5ik.r24135/14410
K 10
repodlgs.h
V 24
file 119.5ck.r18439/2365
K 14
spaceshipdlg.c
V 24
file 11c.5ik.r22585/8630
K 14
spaceshipdlg.h
V 23
file 11d.0.r9577/110090
K 8
sprite.c
V 24
file 2y8.5ik.r25901/1213
K 8
sprite.h
V 25
file 2y9.5ik.r20541/55316
K 11
theme_dlg.c
V 25
file 47d.5ik.r20465/70592
K 8
themes.c
V 25
file 34x.5ik.r21621/14885
K 13
tileset_dlg.c
V 25
file 45i.5ik.r23644/79177
K 12
unitselect.c
V 24
file 6pa.5ik.r22824/2432
K 12
unitselect.h
V 25
file 6pb.5g7.r20394/53658
K 14
voteinfo_bar.c
V 24
file 4h8.5ik.r22661/1338
K 14
voteinfo_bar.h
V 24
file 4h9.5ck.r17959/2670
K 7
wldlg.c
V 24
file 11e.5ik.r22595/2273
K 7
wldlg.h
V 25
file 11f.5ck.r16285/86707
END
ENDREP
id: zs.5ik.r25901/5414
type: dir
pred: zs.5ik.r25870/10976
count: 1679
text: 25901 1491 3910 3910 c04ec329565e82700e1c034a71378994
props: 11108 11912 79 0 480bb3268560e84c2d6c8376c422c65e
cpath: /branches/S2_4/client/gui-gtk-3.0
copyroot: 19694 /trunk/client/gui-gtk-3.0

PLAIN
K 11
Makefile.am
V 23
file 5f.5ii.r24747/9741
K 6
agents
V 22
dir zf.5ii.r23844/2357
K 11
attribute.c
V 23
file xh.5ii.r23789/1745
K 11
attribute.h
V 24
file xi.5ck.r18863/23649
K 7
audio.c
V 27
file 139.5ii.r21492/3324670
K 7
audio.h
V 25
file 13a.5ck.r18863/23408
K 12
audio_none.c
V 26
file 13d.5ck.r19259/462511
K 12
audio_none.h
V 25
file 13e.5ck.r18863/20841
K 11
audio_sdl.c
V 25
file 13f.5ck.r19354/73618
K 11
audio_sdl.h
V 25
file 13g.5ck.r18863/23885
K 17
chatline_common.c
V 24
file 14q.5ii.r24897/9515
K 17
chatline_common.h
V 25
file 14r.5ck.r18863/23155
K 16
citydlg_common.c
V 23
file z4.5ii.r24933/7003
K 16
citydlg_common.h
V 24
file z5.5ck.r18863/18619
K 13
cityrepdata.c
V 21
file mb.5ii.r24134/90
K 13
cityrepdata.h
V 24
file mc.5ck.r18863/19121
K 11
civclient.c
V 23
file 4f2.5ck.r15408/695
K 13
client_main.c
V 22
file 2f.5ix.r25835/532
K 13
client_main.h
V 24
file hz.5cq.r18863/25358
K 8
climap.c
V 24
file 197.5ck.r20232/3008
K 8
climap.h
V 25
file 198.5ck.r18863/24126
K 9
climisc.c
V 23
file d5.5ii.r24897/9780
K 9
climisc.h
V 23
file i0.5ck.r19330/6112
K 8
clinet.c
V 24
file hc.5ck.r20327/24570
K 8
clinet.h
V 24
file i1.5ck.r18863/24866
K 15
colors_common.c
V 24
file 33a.5ii.r22857/2948
K 15
colors_common.h
V 25
file 33b.5ck.r19135/48891
K 19
connectdlg_common.c
V 23
file 2fw.5ii.r24354/315
K 19
connectdlg_common.h
V 25
file 2fx.5ck.r19154/53802
K 9
control.c
V 24
file gz.5ii.r24575/24348
K 9
control.h
V 24
file i2.5ii.r20967/50470
K 7
dummy.c
V 23
file 4f9.5ck.r15641/551
K 12
dummycxx.cpp
V 23
file 6kr.5ck.r18947/939
K 8
editor.c
V 23
file 3bg.5ii.r24536/193
K 8
editor.h
V 26
file 3bh.5ck.r19295/112400
K 11
ggzclient.c
V 26
file 394.5ck.r20126/104106
K 11
ggzclient.h
V 25
file 395.5ck.r18863/21083
K 17
global_worklist.c
V 26
file 4i6.5ck.r19259/493810
K 17
global_worklist.h
V 25
file 4i7.5ck.r18863/22960
K 6
goto.c
V 22
file vu.5ii.r24109/931
K 6
goto.h
V 24
file vv.5ck.r18863/20355
K 8
gui-ftwl
V 24
dir 2k2.5ck.r20393/70535
K 11
gui-gtk-2.0
V 22
dir zs.5ii.r25870/6508
K 11
gui-gtk-3.0
V 22
dir zs.5ik.r25901/5414
K 6
gui-qt
V 23
dir 6ie.5ii.r24273/3430
K 7
gui-sdl
V 23
dir 16t.5ii.r25460/5703
K 8
gui-stub
V 25
dir mh.5ii.r21529/1407847
K 9
gui-win32
V 23
dir np.5ii.r21744/29252
K 7
gui-xaw
V 23
dir 9o.5ii.r25358/16521
K 10
helpdata.c
V 22
file h1.5ii.r25865/911
K 10
helpdata.h
V 24
file i3.5ck.r18863/21834
K 7
include
V 22
dir b8.5ii.r22414/8419
K 19
luaconsole_common.c
V 25
file 75z.5ii.r24897/10037
K 19
luaconsole_common.h
V 25
file 760.5ck.r20306/31022
K 9
luascript
V 24
dir 761.5ii.r24747/10542
K 16
mapctrl_common.c
V 25
file 15m.5ck.r20389/27960
K 16
mapctrl_common.h
V 25
file 15n.5ck.r19893/12504
K 16
mapview_common.c
V 22
file z2.5ii.r23999/152
K 16
mapview_common.h
V 24
file z3.5ck.r20392/39510
K 19
messagewin_common.c
V 25
file 14s.5ck.r19354/71979
K 19
messagewin_common.h
V 25
file 14t.5ck.r18863/21579
K 9
options.c
V 24
file dc.5ii.r24202/13487
K 9
options.h
V 24
file i4.5ii.r22672/12010
K 17
overview_common.c
V 25
file 2yk.5ii.r23661/17311
K 17
overview_common.h
V 24
file 2yl.5ck.r19511/5441
K 10
packhand.c
V 21
file n.5ii.r25835/801
K 10
packhand.h
V 24
file i5.5ck.r18863/20596
K 15
plrdlg_common.c
V 23
file 14u.5ii.r23428/983
K 15
plrdlg_common.h
V 25
file 14v.5ck.r18863/21328
K 17
repodlgs_common.c
V 25
file 11i.5ii.r22326/71643
K 17
repodlgs_common.h
V 25
file 11j.5ck.r19589/11861
K 9
reqtree.c
V 24
file 2ym.5ii.r24138/5067
K 9
reqtree.h
V 24
file 2yn.5ck.r19057/3837
K 9
servers.c
V 25
file 33x.5ii.r22326/76420
K 9
servers.h
V 25
file 33y.5ck.r19197/36044
K 6
text.c
V 25
file 2g3.5ii.r22326/71384
K 6
text.h
V 25
file 2g4.5ii.r20967/50730
K 15
themes_common.c
V 25
file 352.5ck.r19354/73121
K 15
themes_common.h
V 25
file 353.5ck.r18863/22710
K 10
tilespec.c
V 22
file hl.5ii.r24293/364
K 10
tilespec.h
V 23
file i6.5ii.r23826/5332
K 19
unitselect_common.c
V 24
file 76v.5ck.r20397/3580
K 19
unitselect_common.h
V 24
file 76w.5ck.r20397/3746
K 14
update_queue.c
V 25
file 4jw.5ii.r22414/13188
K 14
update_queue.h
V 25
file 4jx.5ck.r18863/22078
K 10
voteinfo.c
V 25
file 4fe.5ck.r19354/72931
K 10
voteinfo.h
V 25
file 4ff.5ck.r18863/22523
END
ENDREP
id: d.5ii.r25901/9835
type: dir
pred: d.5ii.r25870/15398
count: 5596
text: 25901 5686 4136 4136 820cbb823c3c733cdf53eb61708c07e4
props: 23992 803 299 0 86ef12017fc9a8fae6749e3fb3a2aa50
cpath: /branches/S2_4/client
copyroot: 20416 /branches/S2_4

PLAIN
K 9
ABOUT-NLS
V 22
file fu.0.r13215/85704
K 7
AUTHORS
V 24
file 5u.5ii.r22144/14016
K 7
COPYING
V 19
file 1h.0.r9643/400
K 9
ChangeLog
V 26
file 6l.5ii.r25883/5694991
K 7
INSTALL
V 23
file 6.5ii.r23651/28514
K 11
Makefile.am
V 24
file 59.5ii.r23989/13807
K 4
NEWS
V 24
file 6m.5ii.r25632/75507
K 8
NEWS-2.4
V 25
file jp5.5ii.r25880/14898
K 6
README
V 20
file 7.0.r4421/96382
K 2
ai
V 21
dir 8.5ii.r25753/2939
K 10
autogen.sh
V 23
file 12o.5ii.r24093/115
K 9
bootstrap
V 23
dir 2p5.5ii.r25679/2749
K 6
client
V 21
dir d.5ii.r25901/9835
K 6
common
V 21
dir p.5ii.r25893/4445
K 12
config.mac.h
V 20
file hb.0.r6045/5982
K 12
configure.ac
V 24
file 149.5ii.r25596/4281
K 4
data
V 21
dir w.5ii.r25827/7036
K 6
debian
V 22
dir 5w.5ii.r22192/3202
K 12
dependencies
V 23
dir 2yu.5ii.r25596/4029
K 11
diff_ignore
V 22
file qq.5ck.r19346/607
K 3
doc
V 22
dir k7.5ii.r25879/2126
K 10
fc_version
V 22
file 2lo.5ij.r25882/48
K 2
m4
V 23
dir 12p.5ii.r25030/2842
K 6
manual
V 23
dir 2m2.5ii.r24834/7345
K 7
modinst
V 23
dir 4pj.5ii.r25485/1828
K 2
po
V 26
dir fs.5ii.r25881/15472306
K 7
scripts
V 22
dir 2yo.5ii.r24504/875
K 6
server
V 21
dir z.5ii.r25862/4941
K 10
stamp-h.in
V 19
file 80.0.r1125/241
K 5
tests
V 22
dir 2g9.5ii.r22097/841
K 7
utility
V 22
dir 1c.5ii.r25728/4530
K 3
vms
V 25
dir u9.5ii.r21529/1398731
K 5
win32
V 23
dir 2eu.5ii.r24296/3491
END
ENDREP
id: 3.5ii.r25901/11441
type: dir
pred: 3.5ii.r25893/6048
count: 16213
text: 25901 10081 1347 1347 ce2d9639def1027938511d0ba3abce3a
props: 20140 3888 282 0 e4bb46e81629a60eef613b169b23a9ea
cpath: /branches/S2_4
copyroot: 20416 /branches/S2_4

PLAIN
K 5
S1_14
V 21
dir 3.21.r18109/18803
K 4
S2_0
V 21
dir 3.10x.r21862/4178
K 4
S2_1
V 22
dir 3.59e.r20026/11014
K 4
S2_2
V 21
dir 3.5cy.r21861/5036
K 4
S2_3
V 21
dir 3.5f2.r24391/5183
K 4
S2_4
V 22
dir 3.5ii.r25901/11441
K 4
S2_5
V 22
dir 3.5kv.r25900/11408
K 11
freeciv-web
V 22
dir 3.5bl.r13594/14918
END
ENDREP
id: 1.0.r25901/12001
type: dir
pred: 1.0.r25900/11968
count: 7798
text: 25901 11683 305 305 b157c7fabcd34c70fe4c5df67544f9c1
cpath: /branches
copyroot: 0 /

PLAIN
K 8
branches
V 20
dir 1.0.r25901/12001
K 4
tags
V 19
dir 2.0.r25885/6524
K 5
trunk
V 22
dir 3.5ck.r25899/11573
K 7
website
V 21
dir 3ge.0.r22980/2263
END
ENDREP
id: 0.0.r25901/12325
type: dir
pred: 0.0.r25900/12292
count: 25901
text: 25901 12158 154 154 266b8a3c8512e04ea231328df45b2b3f
cpath: /
copyroot: 0 /

2y8.5ik.t25900-1 modify true false /branches/S2_4/client/gui-gtk-3.0/sprite.c


12325 12475