diff --git a/ChangeLog b/ChangeLog index be4ad7fe98..7269a7474f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,21 @@ +2007-03-15 Martin Nordholts + + Converted .gbr to .vbr brushes where possible. Fixes bug #322176 and + bug #157506. + + * data/brushes/Makefile.am: Changed .gbr for .vbr-counterparts for + converted brushes. + + * data/brushes/*circle.gbr: + * data/brushes/*fcircle.gbr: + * data/brushes/DStar*.gbr: + * data/brushes/callig*.gbr: Removed. + + * data/brushes/Circle-*.vbr: + * data/brushes/Circle-Fuzzy-*.vbr: + * data/brushes/Diagonal-Star-*.vbr: + * data/brushes/Calligraphic-Brush-*.vbr: Added. + 2007-03-15 Michael Natterer * app/tools/gimpaligntool.c diff --git a/data/brushes/11circle.gbr b/data/brushes/11circle.gbr deleted file mode 100644 index d843b1b138..0000000000 Binary files a/data/brushes/11circle.gbr and /dev/null differ diff --git a/data/brushes/11fcircle.gbr b/data/brushes/11fcircle.gbr deleted file mode 100644 index 86bd98536b..0000000000 Binary files a/data/brushes/11fcircle.gbr and /dev/null differ diff --git a/data/brushes/13circle.gbr b/data/brushes/13circle.gbr deleted file mode 100644 index ae4269fa8f..0000000000 Binary files a/data/brushes/13circle.gbr and /dev/null differ diff --git a/data/brushes/13fcircle.gbr b/data/brushes/13fcircle.gbr deleted file mode 100644 index 456d105636..0000000000 Binary files a/data/brushes/13fcircle.gbr and /dev/null differ diff --git a/data/brushes/15circle.gbr b/data/brushes/15circle.gbr deleted file mode 100644 index ce99d36ea5..0000000000 Binary files a/data/brushes/15circle.gbr and /dev/null differ diff --git a/data/brushes/15fcircle.gbr b/data/brushes/15fcircle.gbr deleted file mode 100644 index c198ef4e01..0000000000 Binary files a/data/brushes/15fcircle.gbr and /dev/null differ diff --git a/data/brushes/17circle.gbr b/data/brushes/17circle.gbr deleted file mode 100644 index b063f54c99..0000000000 Binary files a/data/brushes/17circle.gbr and /dev/null differ diff --git a/data/brushes/17fcircle.gbr b/data/brushes/17fcircle.gbr deleted file mode 100644 index 1a17056028..0000000000 Binary files a/data/brushes/17fcircle.gbr and /dev/null differ diff --git a/data/brushes/19circle.gbr b/data/brushes/19circle.gbr deleted file mode 100644 index a0a581b222..0000000000 Binary files a/data/brushes/19circle.gbr and /dev/null differ diff --git a/data/brushes/19fcircle.gbr b/data/brushes/19fcircle.gbr deleted file mode 100644 index 6418446d61..0000000000 Binary files a/data/brushes/19fcircle.gbr and /dev/null differ diff --git a/data/brushes/1circle.gbr b/data/brushes/1circle.gbr deleted file mode 100644 index 8c81f6bf2f..0000000000 Binary files a/data/brushes/1circle.gbr and /dev/null differ diff --git a/data/brushes/3circle.gbr b/data/brushes/3circle.gbr deleted file mode 100644 index ddddec9fe7..0000000000 Binary files a/data/brushes/3circle.gbr and /dev/null differ diff --git a/data/brushes/3fcircle.gbr b/data/brushes/3fcircle.gbr deleted file mode 100644 index 7a07a1afa4..0000000000 Binary files a/data/brushes/3fcircle.gbr and /dev/null differ diff --git a/data/brushes/5circle.gbr b/data/brushes/5circle.gbr deleted file mode 100644 index c910e29453..0000000000 Binary files a/data/brushes/5circle.gbr and /dev/null differ diff --git a/data/brushes/5fcircle.gbr b/data/brushes/5fcircle.gbr deleted file mode 100644 index 83d504238a..0000000000 Binary files a/data/brushes/5fcircle.gbr and /dev/null differ diff --git a/data/brushes/7circle.gbr b/data/brushes/7circle.gbr deleted file mode 100644 index 45ea2103d9..0000000000 Binary files a/data/brushes/7circle.gbr and /dev/null differ diff --git a/data/brushes/7fcircle.gbr b/data/brushes/7fcircle.gbr deleted file mode 100644 index b069c6f8c6..0000000000 Binary files a/data/brushes/7fcircle.gbr and /dev/null differ diff --git a/data/brushes/9circle.gbr b/data/brushes/9circle.gbr deleted file mode 100644 index 369d85cc54..0000000000 Binary files a/data/brushes/9circle.gbr and /dev/null differ diff --git a/data/brushes/9fcircle.gbr b/data/brushes/9fcircle.gbr deleted file mode 100644 index 6e1c414c0a..0000000000 Binary files a/data/brushes/9fcircle.gbr and /dev/null differ diff --git a/data/brushes/Calligraphic-Brush-0.vbr b/data/brushes/Calligraphic-Brush-0.vbr new file mode 100644 index 0000000000..cc53fb96d5 --- /dev/null +++ b/data/brushes/Calligraphic-Brush-0.vbr @@ -0,0 +1,8 @@ +GIMP-VBR +1.0 +Calligraphic Brush +1.000000 +6.600000 +1.000000 +3.600000 +45.000000 diff --git a/data/brushes/Calligraphic-Brush-1.vbr b/data/brushes/Calligraphic-Brush-1.vbr new file mode 100644 index 0000000000..d10175b1ce --- /dev/null +++ b/data/brushes/Calligraphic-Brush-1.vbr @@ -0,0 +1,8 @@ +GIMP-VBR +1.0 +Calligraphic Brush#1 +1.000000 +14.100000 +1.000000 +6.900000 +45.000000 diff --git a/data/brushes/Calligraphic-Brush-2.vbr b/data/brushes/Calligraphic-Brush-2.vbr new file mode 100644 index 0000000000..531fac3a90 --- /dev/null +++ b/data/brushes/Calligraphic-Brush-2.vbr @@ -0,0 +1,8 @@ +GIMP-VBR +1.0 +Calligraphic Brush#2 +1.000000 +10.730309 +1.000000 +5.265306 +45.000000 diff --git a/data/brushes/Calligraphic-Brush-3.vbr b/data/brushes/Calligraphic-Brush-3.vbr new file mode 100644 index 0000000000..df65ad8dcc --- /dev/null +++ b/data/brushes/Calligraphic-Brush-3.vbr @@ -0,0 +1,8 @@ +GIMP-VBR +1.0 +Calligraphic Brush#3 +1.000000 +2.962771 +1.000000 +2.075472 +45.000000 diff --git a/data/brushes/Circle-1.vbr b/data/brushes/Circle-1.vbr new file mode 100644 index 0000000000..241cef1862 --- /dev/null +++ b/data/brushes/Circle-1.vbr @@ -0,0 +1,8 @@ +GIMP-VBR +1.0 +Circle (01) +1.000000 +0.500000 +1.000000 +1.000000 +0.000000 diff --git a/data/brushes/Circle-11.vbr b/data/brushes/Circle-11.vbr new file mode 100644 index 0000000000..76d963abd0 --- /dev/null +++ b/data/brushes/Circle-11.vbr @@ -0,0 +1,8 @@ +GIMP-VBR +1.0 +Circle (11) +1.000000 +5.500000 +1.000000 +1.000000 +0.000000 diff --git a/data/brushes/Circle-13.vbr b/data/brushes/Circle-13.vbr new file mode 100644 index 0000000000..12c8c9c281 --- /dev/null +++ b/data/brushes/Circle-13.vbr @@ -0,0 +1,8 @@ +GIMP-VBR +1.0 +Circle (13) +1.000000 +6.500000 +1.000000 +1.000000 +0.000000 diff --git a/data/brushes/Circle-15.vbr b/data/brushes/Circle-15.vbr new file mode 100644 index 0000000000..018b8b31e9 --- /dev/null +++ b/data/brushes/Circle-15.vbr @@ -0,0 +1,8 @@ +GIMP-VBR +1.0 +Circle (15) +1.000000 +7.500000 +1.000000 +1.000000 +0.000000 diff --git a/data/brushes/Circle-17.vbr b/data/brushes/Circle-17.vbr new file mode 100644 index 0000000000..ca174a0c0f --- /dev/null +++ b/data/brushes/Circle-17.vbr @@ -0,0 +1,8 @@ +GIMP-VBR +1.0 +Circle (17) +1.000000 +8.500000 +1.000000 +1.000000 +0.000000 diff --git a/data/brushes/Circle-19.vbr b/data/brushes/Circle-19.vbr new file mode 100644 index 0000000000..bf994c0235 --- /dev/null +++ b/data/brushes/Circle-19.vbr @@ -0,0 +1,8 @@ +GIMP-VBR +1.0 +Circle (19) +1.000000 +9.500000 +1.000000 +1.000000 +0.000000 diff --git a/data/brushes/Circle-3.vbr b/data/brushes/Circle-3.vbr new file mode 100644 index 0000000000..2151590719 --- /dev/null +++ b/data/brushes/Circle-3.vbr @@ -0,0 +1,8 @@ +GIMP-VBR +1.0 +Circle (03) +1.000000 +1.500000 +1.000000 +1.000000 +0.000000 diff --git a/data/brushes/Circle-5.vbr b/data/brushes/Circle-5.vbr new file mode 100644 index 0000000000..5bb574d9b1 --- /dev/null +++ b/data/brushes/Circle-5.vbr @@ -0,0 +1,8 @@ +GIMP-VBR +1.0 +Circle (05) +1.000000 +2.500000 +1.000000 +1.000000 +0.000000 diff --git a/data/brushes/Circle-7.vbr b/data/brushes/Circle-7.vbr new file mode 100644 index 0000000000..7f0baa2d02 --- /dev/null +++ b/data/brushes/Circle-7.vbr @@ -0,0 +1,8 @@ +GIMP-VBR +1.0 +Circle (07) +1.000000 +3.500000 +1.000000 +1.000000 +0.000000 diff --git a/data/brushes/Circle-9.vbr b/data/brushes/Circle-9.vbr new file mode 100644 index 0000000000..8bec1aea0c --- /dev/null +++ b/data/brushes/Circle-9.vbr @@ -0,0 +1,8 @@ +GIMP-VBR +1.0 +Circle (09) +1.000000 +4.500000 +1.000000 +1.000000 +0.000000 diff --git a/data/brushes/Circle-Fuzzy-11.vbr b/data/brushes/Circle-Fuzzy-11.vbr new file mode 100644 index 0000000000..89e3c8a5f3 --- /dev/null +++ b/data/brushes/Circle-Fuzzy-11.vbr @@ -0,0 +1,8 @@ +GIMP-VBR +1.0 +Circle Fuzzy (11) +1.000000 +5.500000 +0.500000 +1.000000 +0.000000 diff --git a/data/brushes/Circle-Fuzzy-13.vbr b/data/brushes/Circle-Fuzzy-13.vbr new file mode 100644 index 0000000000..f5bc1f46b0 --- /dev/null +++ b/data/brushes/Circle-Fuzzy-13.vbr @@ -0,0 +1,8 @@ +GIMP-VBR +1.0 +Circle Fuzzy (13) +1.000000 +6.500000 +0.500000 +1.000000 +0.000000 diff --git a/data/brushes/Circle-Fuzzy-15.vbr b/data/brushes/Circle-Fuzzy-15.vbr new file mode 100644 index 0000000000..c010dce11f --- /dev/null +++ b/data/brushes/Circle-Fuzzy-15.vbr @@ -0,0 +1,8 @@ +GIMP-VBR +1.0 +Circle Fuzzy (15) +1.000000 +7.500000 +0.500000 +1.000000 +0.000000 diff --git a/data/brushes/Circle-Fuzzy-17.vbr b/data/brushes/Circle-Fuzzy-17.vbr new file mode 100644 index 0000000000..dc0855ef4b --- /dev/null +++ b/data/brushes/Circle-Fuzzy-17.vbr @@ -0,0 +1,8 @@ +GIMP-VBR +1.0 +Circle Fuzzy (17) +1.000000 +8.500000 +0.500000 +1.000000 +0.000000 diff --git a/data/brushes/Circle-Fuzzy-19.vbr b/data/brushes/Circle-Fuzzy-19.vbr new file mode 100644 index 0000000000..3911e3c20d --- /dev/null +++ b/data/brushes/Circle-Fuzzy-19.vbr @@ -0,0 +1,8 @@ +GIMP-VBR +1.0 +Circle Fuzzy (19) +1.000000 +9.500000 +0.500000 +1.000000 +0.000000 diff --git a/data/brushes/Circle-Fuzzy-3.vbr b/data/brushes/Circle-Fuzzy-3.vbr new file mode 100644 index 0000000000..c2ea3c674f --- /dev/null +++ b/data/brushes/Circle-Fuzzy-3.vbr @@ -0,0 +1,8 @@ +GIMP-VBR +1.0 +Circle Fuzzy (03) +1.000000 +1.500000 +0.500000 +1.000000 +0.000000 diff --git a/data/brushes/Circle-Fuzzy-5.vbr b/data/brushes/Circle-Fuzzy-5.vbr new file mode 100644 index 0000000000..42559af5f2 --- /dev/null +++ b/data/brushes/Circle-Fuzzy-5.vbr @@ -0,0 +1,8 @@ +GIMP-VBR +1.0 +Circle Fuzzy (05) +1.000000 +2.500000 +0.500000 +1.000000 +0.000000 diff --git a/data/brushes/Circle-Fuzzy-7.vbr b/data/brushes/Circle-Fuzzy-7.vbr new file mode 100644 index 0000000000..32b6a1ccf2 --- /dev/null +++ b/data/brushes/Circle-Fuzzy-7.vbr @@ -0,0 +1,8 @@ +GIMP-VBR +1.0 +Circle Fuzzy (07) +1.000000 +3.500000 +0.500000 +1.000000 +0.000000 diff --git a/data/brushes/Circle-Fuzzy-9.vbr b/data/brushes/Circle-Fuzzy-9.vbr new file mode 100644 index 0000000000..5ad17cac3c --- /dev/null +++ b/data/brushes/Circle-Fuzzy-9.vbr @@ -0,0 +1,8 @@ +GIMP-VBR +1.0 +Circle Fuzzy (09) +1.000000 +4.500000 +0.500000 +1.000000 +0.000000 diff --git a/data/brushes/DStar11.gbr b/data/brushes/DStar11.gbr deleted file mode 100644 index cab5714ab5..0000000000 Binary files a/data/brushes/DStar11.gbr and /dev/null differ diff --git a/data/brushes/DStar17.gbr b/data/brushes/DStar17.gbr deleted file mode 100644 index 496919cb69..0000000000 Binary files a/data/brushes/DStar17.gbr and /dev/null differ diff --git a/data/brushes/DStar25.gbr b/data/brushes/DStar25.gbr deleted file mode 100644 index 29f8fb252f..0000000000 Binary files a/data/brushes/DStar25.gbr and /dev/null differ diff --git a/data/brushes/Diagonal-Star-11.vbr b/data/brushes/Diagonal-Star-11.vbr new file mode 100644 index 0000000000..144f10fe7a --- /dev/null +++ b/data/brushes/Diagonal-Star-11.vbr @@ -0,0 +1,10 @@ +GIMP-VBR +1.5 +Diagonal Star (11) +circle +1.000000 +5.500000 +4 +1.000000 +14.000000 +45.000000 diff --git a/data/brushes/Diagonal-Star-17.vbr b/data/brushes/Diagonal-Star-17.vbr new file mode 100644 index 0000000000..8e59e9cc17 --- /dev/null +++ b/data/brushes/Diagonal-Star-17.vbr @@ -0,0 +1,10 @@ +GIMP-VBR +1.5 +Diagonal Star (17) +circle +1.000000 +8.500000 +4 +1.000000 +14.000000 +45.000000 diff --git a/data/brushes/Diagonal-Star-25.vbr b/data/brushes/Diagonal-Star-25.vbr new file mode 100644 index 0000000000..20fc9eb774 --- /dev/null +++ b/data/brushes/Diagonal-Star-25.vbr @@ -0,0 +1,10 @@ +GIMP-VBR +1.5 +Diagonal Star (25) +circle +1.000000 +14.000000 +4 +1.000000 +20.000000 +45.000000 diff --git a/data/brushes/Makefile.am b/data/brushes/Makefile.am index 282daefef9..9726ce98e1 100644 --- a/data/brushes/Makefile.am +++ b/data/brushes/Makefile.am @@ -3,51 +3,51 @@ brushdatadir = $(gimpdatadir)/brushes brushdata_DATA = \ - 10x10square.gbr \ - 10x10squareBlur.gbr \ - 11circle.gbr \ - 11fcircle.gbr \ - 13circle.gbr \ - 13fcircle.gbr \ - 15circle.gbr \ - 15fcircle.gbr \ - 17circle.gbr \ - 17fcircle.gbr \ - 19circle.gbr \ - 19fcircle.gbr \ - 1circle.gbr \ - 20x20square.gbr \ - 20x20squareBlur.gbr \ - 3circle.gbr \ - 3fcircle.gbr \ - 5circle.gbr \ - 5fcircle.gbr \ - 5x5square.gbr \ - 5x5squareBlur.gbr \ - 7circle.gbr \ - 7fcircle.gbr \ - 9circle.gbr \ - 9fcircle.gbr \ - DStar11.gbr \ - DStar17.gbr \ - DStar25.gbr \ - SketchBrush-16.gih \ - SketchBrush-32.gih \ - SketchBrush-64.gih \ - callig1.gbr \ - callig2.gbr \ - callig3.gbr \ - callig4.gbr \ - confetti.gbr \ - confetti.gih \ - dunes.gbr \ - feltpen.gih \ - galaxy.gbr \ - galaxy_big.gbr \ - galaxy_small.gbr \ - hsparks.gih \ - pepper.gbr \ - pixel.gbr \ + 10x10square.gbr \ + 10x10squareBlur.gbr \ + 20x20square.gbr \ + 20x20squareBlur.gbr \ + 5x5square.gbr \ + 5x5squareBlur.gbr \ + Calligraphic-Brush-0.vbr \ + Calligraphic-Brush-1.vbr \ + Calligraphic-Brush-2.vbr \ + Calligraphic-Brush-3.vbr \ + Circle-1.vbr \ + Circle-3.vbr \ + Circle-5.vbr \ + Circle-7.vbr \ + Circle-9.vbr \ + Circle-11.vbr \ + Circle-13.vbr \ + Circle-15.vbr \ + Circle-17.vbr \ + Circle-19.vbr \ + Circle-Fuzzy-3.vbr \ + Circle-Fuzzy-5.vbr \ + Circle-Fuzzy-7.vbr \ + Circle-Fuzzy-9.vbr \ + Circle-Fuzzy-11.vbr \ + Circle-Fuzzy-13.vbr \ + Circle-Fuzzy-15.vbr \ + Circle-Fuzzy-17.vbr \ + Circle-Fuzzy-19.vbr \ + Diagonal-Star-11.vbr \ + Diagonal-Star-17.vbr \ + Diagonal-Star-25.vbr \ + SketchBrush-16.gih \ + SketchBrush-32.gih \ + SketchBrush-64.gih \ + confetti.gbr \ + confetti.gih \ + dunes.gbr \ + feltpen.gih \ + galaxy.gbr \ + galaxy_big.gbr \ + galaxy_small.gbr \ + hsparks.gih \ + pepper.gbr \ + pixel.gbr \ vine.gih EXTRA_DIST = $(brushdata_DATA) diff --git a/data/brushes/callig1.gbr b/data/brushes/callig1.gbr deleted file mode 100644 index ef3bfa2bb5..0000000000 Binary files a/data/brushes/callig1.gbr and /dev/null differ diff --git a/data/brushes/callig2.gbr b/data/brushes/callig2.gbr deleted file mode 100644 index d607dd5747..0000000000 Binary files a/data/brushes/callig2.gbr and /dev/null differ diff --git a/data/brushes/callig3.gbr b/data/brushes/callig3.gbr deleted file mode 100644 index d84c256cba..0000000000 Binary files a/data/brushes/callig3.gbr and /dev/null differ diff --git a/data/brushes/callig4.gbr b/data/brushes/callig4.gbr deleted file mode 100644 index 8be1bc1df0..0000000000 Binary files a/data/brushes/callig4.gbr and /dev/null differ