[fondue-commits] [SCM] Fondue Font Editor branch, master, updated. cb80ff8c06e34e34cd88cee1e2ba8b569d27ef4f
Eugeniy Meshcheryakov
eugen at debian.org
Wed Apr 2 12:16:53 UTC 2008
The following commit has been merged in the master branch:
commit 6b563f63d903c3c058fa446c3b9a091993abf77b
Author: Eugeniy Meshcheryakov <eugen at debian.org>
Date: Wed Apr 2 14:11:40 2008 +0200
remove ruby library
diff --git a/Makefile.am b/Makefile.am
index 5b3cf94..be017ce 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,7 +11,6 @@ noinst_HEADERS =
include src/src.rules
include nongui/nongui.rules
include gui/gui.rules
-include ruby/ruby.rules
include scripts/scripts.rules
include qscript/qscript.rules
include filters/filters.rules
@@ -27,4 +26,4 @@ EXTRA_DIST += data/instructions.xml schema/fondue-font.rng
.awk.awked.cxx:
$(AWK) -f $< $(DATAFILE) > $@
-INCLUDES = -I$(srcdir)/src -I$(srcdir)/ruby -I$(srcdir)/gui -I$(srcdir)/nongui -I$(srcdir)/qscript -I$(srcdir)/filters
+INCLUDES = -I$(srcdir)/src -I$(srcdir)/gui -I$(srcdir)/nongui -I$(srcdir)/qscript -I$(srcdir)/filters
diff --git a/ruby/ascii85.cxx b/ruby/ascii85.cxx
deleted file mode 100644
index 8eab319..0000000
--- a/ruby/ascii85.cxx
+++ /dev/null
@@ -1,52 +0,0 @@
-/* Copyright © 2007 Євгеній Мещеряков <eugen at debian.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#include "ascii85.h"
-
-QByteArray decodeAscii85(QDataStream &buf, int data_size)
-{
- QByteArray decoded;
- quint32 accum = 0;
- char d;
-
- int n = 0;
-
- while (buf.readRawData(&d, 1) == 1) {
- if (d == 'z') {
- /* XXX check this */
- decoded.append(QByteArray(4, '\0'));
- }
- else {
- accum = accum * 85 + (d - 33); n++;
- if (n == 5) {
- n = 0;
- decoded.append(accum >> 24);
- decoded.append(accum >> 16);
- decoded.append(accum >> 8);
- decoded.append(accum);
- accum = 0;
- }
- }
- }
- /* here should be code that adds some bytes into
- * resulting string, but this is not needed with
- * fontforge's ascii85, data needs to be cut instead
- */
- if (decoded.size() < data_size)
- return NULL;
-
- decoded.resize(data_size);
- return decoded;
-}
diff --git a/ruby/ascii85.h b/ruby/ascii85.h
deleted file mode 100644
index 116e0a4..0000000
--- a/ruby/ascii85.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright © 2007 Євгеній Мещеряков <eugen at debian.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#ifndef ASCII85_H
-#define ASCII85_H
-
-#include <QByteArray>
-#include <QDataStream>
-
-QByteArray decodeAscii85(QDataStream &buf, int data_size);
-
-#endif
diff --git a/ruby/ruby.rules b/ruby/ruby.rules
deleted file mode 100644
index 0497fc7..0000000
--- a/ruby/ruby.rules
+++ /dev/null
@@ -1,15 +0,0 @@
-if RUBY_SUPPORT
-noinst_LIBRARIES += libfondueruby.a
-
-libfondueruby_a_SOURCES = \
- ruby/ruby_bindings.cxx \
- ruby/ascii85.cxx
-
-libfondueruby_a_CPPFLAGS = $(ruby_CFLAGS) $(QtCore_CFLAGS)
-endif
-
-noinst_HEADERS += \
- ruby/ruby_bindings.h \
- ruby/ascii85.h
-
-## vim:ft=automake
diff --git a/ruby/ruby_bindings.cxx b/ruby/ruby_bindings.cxx
deleted file mode 100644
index 30b471b..0000000
--- a/ruby/ruby_bindings.cxx
+++ /dev/null
@@ -1,63 +0,0 @@
-/* Copyright © 2007 Євгеній Мещеряков <eugen at debian.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#include <ruby.h>
-#include "ttfdecode.h"
-#include "ascii85.h"
-#include <QBuffer>
-
-static VALUE rubyTTIDecode(VALUE self, VALUE data)
-{
- Q_UNUSED(self);
-
- Check_Type(data, T_STRING);
- QByteArray inputData = QByteArray::fromRawData(RSTRING_PTR(data), RSTRING_LEN(data));
- QBuffer in(&inputData);
- in.open(QIODevice::ReadOnly);
- TTInstructionsDecoder decoder(&in);
-
- QByteArray result = decoder.getAllLines();
- if (decoder.status() == TTInstructionsDecoder::Error)
- rb_raise(rb_eRuntimeError, "bad instructions");
-
- VALUE ret = rb_str_new(result.data(), result.size());
-
- return ret;
-}
-
-static VALUE rubyDecodeAscii85(VALUE self, VALUE data, VALUE nbytes)
-{
- VALUE ret;
- int n = NUM2INT(nbytes);
-
- Q_UNUSED(self);
-
- Check_Type(data, T_STRING);
-
- QByteArray inputData = QByteArray::fromRawData(RSTRING_PTR(data), RSTRING_LEN(data));
- QDataStream in(&inputData, QIODevice::ReadOnly);
- QByteArray qs = decodeAscii85(in, n);
-
- ret = rb_str_new(qs.data(), qs.size());
-
- return ret;
-}
-
-void addRubyBindings()
-{
- VALUE mod = rb_define_module("Fe");
- rb_define_module_function(mod, "ttidecode", RUBY_METHOD_FUNC(rubyTTIDecode), 1);
- rb_define_module_function(mod, "decode_ascii85", RUBY_METHOD_FUNC(rubyDecodeAscii85), 2);
-}
diff --git a/ruby/ruby_bindings.h b/ruby/ruby_bindings.h
deleted file mode 100644
index 1662a9a..0000000
--- a/ruby/ruby_bindings.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright © 2007 Євгеній Мещеряков <eugen at debian.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#ifndef RUBY_BINDINGS_H
-#define RUBY_BINDINGS_H
-
-void addRubyBindings();
-
-#endif
--
Fondue Font Editor
More information about the fondue-commits
mailing list