date:20160207

[EGIT] [legacy/imlib2] master 02/02: Indent.

2016-02-07 Thread Kim Woelders

kwo pushed a commit to branch master.

http://git.enlightenment.org/legacy/imlib2.git/commit/?id=93e617676427641b9c35198170941a5c95130893

commit 93e617676427641b9c35198170941a5c95130893
Author: Kim Woelders 
Date:   Sun Feb 7 08:08:00 2016 +0100

Indent.
---
 src/modules/loaders/loader_ff.c | 303 +---
 1 file changed, 161 insertions(+), 142 deletions(-)

diff --git a/src/modules/loaders/loader_ff.c b/src/modules/loaders/loader_ff.c
index 63f4c65..bd98eae 100644
--- a/src/modules/loaders/loader_ff.c
+++ b/src/modules/loaders/loader_ff.c
@@ -7,156 +7,175 @@
 #define LEN(x) (sizeof((x)) / sizeof(*(x)))
 
 char
-load(ImlibImage *im, ImlibProgressFunction progress,
+load(ImlibImage * im, ImlibProgressFunction progress,
  char progress_granularity, char immediate_load)
 {
-   FILE *f;
-   size_t rowlen, i, j;
-   uint32_t hdr[2 + 1 + 1], w, h;
-   uint16_t *row;
-   uint8_t *dat;
-
-   /* open the file for reading */
-   if (!(f = fopen(im->real_file, "rb"))) {
-   return 0;
-   }
-
-   /* read and check the header */
-   if (!im->data) {
-   if (fread(hdr, sizeof(uint32_t), LEN(hdr), f) != LEN(hdr) ||
-   memcmp("farbfeld", hdr, sizeof("farbfeld") - 1)) {
-   fclose(f);
-   return 0;
-   }
-   im->w = ntohl(hdr[2]);
-   im->h = ntohl(hdr[3]);
-   if (!IMAGE_DIMENSIONS_OK(im->w, im->h)) {
-   fclose(f);
-   return 0;
-   }
-
-   /* set format */
-   if (!im->loader) {
-   if (!(im->format = strdup("ff"))) {
-   fclose(f);
-   return 0;
-   }
-   }
-   SET_FLAG(im->flags, F_HAS_ALPHA);
-   }
-
-   /* load the data */
-   if (im->loader || immediate_load || progress) {
-   w = im->w;
-   h = im->h;
-   rowlen = w * (sizeof("RGBA") - 1);
-
-   free(im->data);
-   if (!(im->data = malloc(rowlen * h)) ||
-   !(row = malloc(rowlen * sizeof(uint16_t {
-   free(im->data);
-   im->data = NULL;
-   free(row);
-   fclose(f);
-   return 0;
-   }
-
-   dat = (uint8_t *)im->data;
-   for (i = 0; i < h; i++, dat += rowlen) {
-   if (fread(row, sizeof(uint16_t), rowlen, f) !=
-   rowlen) {
-   free(im->data);
-   im->data = NULL;
-   free(row);
-   fclose(f);
-   return 0;
-   }
-   for (j = 0; j < rowlen; j += 4) {
-   /*
-* 16-Bit to 8-Bit (RGBA -> BGRA)
-* 255 * 257 = 65535 = 2^16-1 = UINT16_MAX
-*/
-   dat[j + 2] = ntohs(row[j + 0]) / 257;
-   dat[j + 1] = ntohs(row[j + 1]) / 257;
-   dat[j + 0] = ntohs(row[j + 2]) / 257;
-   dat[j + 3] = ntohs(row[j + 3]) / 257;
-   }
-   }
-   if (progress) {
-   progress(im, 100, 0, 0, im->w, im->h);
-   }
-
-   free(row);
-   }
-
-   fclose(f);
-   return 1;
+   FILE   *f;
+   size_t  rowlen, i, j;
+   uint32_thdr[2 + 1 + 1], w, h;
+   uint16_t   *row;
+   uint8_t*dat;
+
+   /* open the file for reading */
+   if (!(f = fopen(im->real_file, "rb")))
+ {
+return 0;
+ }
+
+   /* read and check the header */
+   if (!im->data)
+ {
+if (fread(hdr, sizeof(uint32_t), LEN(hdr), f) != LEN(hdr) ||
+memcmp("farbfeld", hdr, sizeof("farbfeld") - 1))
+  {
+ fclose(f);
+ return 0;
+  }
+im->w = ntohl(hdr[2]);
+im->h = ntohl(hdr[3]);
+if (!IMAGE_DIMENSIONS_OK(im->w, im->h))
+  {
+ fclose(f);
+ return 0;
+  }
+
+/* set format */
+if (!im->loader)
+  {
+ if (!(im->format = strdup("ff")))
+   {
+  fclose(f);
+  return 0;
+   }
+  }
+SET_FLAG(im->flags, F_HAS_ALPHA);
+ }
+
+   /* load the data */
+   if (im->loader || immediate_load || progress)
+ {
+w = im->w;
+h = im->h;
+rowlen = w * (sizeof("RGBA") - 1);
+
+free(im->data);
+if (!(im->data = malloc(rowlen * h))

[EGIT] [legacy/imlib2] master 01/02: Add a Farbfeld loader

2016-02-07 Thread FRIGN

kwo pushed a commit to branch master.

http://git.enlightenment.org/legacy/imlib2.git/commit/?id=5cabf38155fed90d38182369a2bd94fecb1dd0a8

commit 5cabf38155fed90d38182369a2bd94fecb1dd0a8
Author: FRIGN 
Date:   Sat Jan 30 22:44:42 2016 +0100

Add a Farbfeld loader

(http://tools.suckless.org/farbfeld)
---
 AUTHORS |   1 +
 imlib2.spec.in  |   9 +++
 src/modules/loaders/Makefile.am |   7 ++
 src/modules/loaders/loader_ff.c | 162 
 4 files changed, 179 insertions(+)

diff --git a/AUTHORS b/AUTHORS
index d24bcd9..907ae55 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -30,3 +30,4 @@ Nick Blievers 
 Mike Castle 
 R.Ramkumar 
 Dmitry Antipov 
+Laslo Hunhold 
diff --git a/imlib2.spec.in b/imlib2.spec.in
index a7b0ebf..999ae4b 100644
--- a/imlib2.spec.in
+++ b/imlib2.spec.in
@@ -72,6 +72,12 @@ Group: System Environment/Libraries
 %description loader_bmp
 BMP image loader/saver for Imlib2
 
+%package loader_ff
+Summary: Imlib2 Farbfeld loader
+Group: System Environment/Libraries
+%description loader_ff
+Farbfeld image loader/saver for Imlib2
+
 %package loader_gif
 Summary: Imlib2 GIF loader
 Group: System Environment/Libraries
@@ -187,6 +193,9 @@ test "x$RPM_BUILD_ROOT" != "x/" && rm -rf $RPM_BUILD_ROOT
 %files loader_bmp
 %attr(755,root,root) %{_libdir}/imlib2/loaders/bmp.so
 
+%files loader_ff
+%attr(755,root,root) %{_libdir}/imlib2/loaders/ff.so
+
 %files loader_gif
 %attr(755,root,root) %{_libdir}/imlib2/loaders/gif.so
 
diff --git a/src/modules/loaders/Makefile.am b/src/modules/loaders/Makefile.am
index 0f3ff3f..40e2257 100644
--- a/src/modules/loaders/Makefile.am
+++ b/src/modules/loaders/Makefile.am
@@ -31,6 +31,7 @@ pkg_LTLIBRARIES  = \
 $(JPEG_L) \
 $(PNG_L) \
 $(TIFF_L) \
+$(FF_L) \
 $(GIF_L) \
 $(ZLIB_L) \
 $(BZ2_L) \
@@ -38,6 +39,7 @@ $(ID3_L) \
 pnm.la \
 argb.la \
 bmp.la \
+ff.la \
 xpm.la \
 tga.la \
 lbm.la
@@ -60,6 +62,11 @@ tiff_la_LDFLAGS  = -module -avoid-version
 tiff_la_LIBADD   = @TIFFLIBS@ $(top_builddir)/src/lib/libImlib2.la
 tiff_la_LIBTOOLFLAGS = --tag=disable-static
 
+ff_la_SOURCES= loader_ff.c
+ff_la_LDFLAGS= -module -avoid-version
+ff_la_LIBADD = $(top_builddir)/src/lib/libImlib2.la
+ff_la_LIBTOOLFLAGS   = --tag=disable-static
+
 gif_la_SOURCES   = loader_gif.c
 gif_la_LDFLAGS   = -module -avoid-version
 gif_la_LIBADD= @GIFLIBS@ $(top_builddir)/src/lib/libImlib2.la
diff --git a/src/modules/loaders/loader_ff.c b/src/modules/loaders/loader_ff.c
new file mode 100644
index 000..63f4c65
--- /dev/null
+++ b/src/modules/loaders/loader_ff.c
@@ -0,0 +1,162 @@
+/* Farbfeld (http://tools.suckless.org/farbfeld) */
+#include 
+#include 
+
+#include "loader_common.h"
+
+#define LEN(x) (sizeof((x)) / sizeof(*(x)))
+
+char
+load(ImlibImage *im, ImlibProgressFunction progress,
+ char progress_granularity, char immediate_load)
+{
+   FILE *f;
+   size_t rowlen, i, j;
+   uint32_t hdr[2 + 1 + 1], w, h;
+   uint16_t *row;
+   uint8_t *dat;
+
+   /* open the file for reading */
+   if (!(f = fopen(im->real_file, "rb"))) {
+   return 0;
+   }
+
+   /* read and check the header */
+   if (!im->data) {
+   if (fread(hdr, sizeof(uint32_t), LEN(hdr), f) != LEN(hdr) ||
+   memcmp("farbfeld", hdr, sizeof("farbfeld") - 1)) {
+   fclose(f);
+   return 0;
+   }
+   im->w = ntohl(hdr[2]);
+   im->h = ntohl(hdr[3]);
+   if (!IMAGE_DIMENSIONS_OK(im->w, im->h)) {
+   fclose(f);
+   return 0;
+   }
+
+   /* set format */
+   if (!im->loader) {
+   if (!(im->format = strdup("ff"))) {
+   fclose(f);
+   return 0;
+   }
+   }
+   SET_FLAG(im->flags, F_HAS_ALPHA);
+   }
+
+   /* load the data */
+   if (im->loader || immediate_load || progress) {
+   w = im->w;
+   h = im->h;
+   rowlen = w * (sizeof("RGBA") - 1);
+
+   free(im->data);
+   if (!(im->data = malloc(rowlen * h)) ||
+   !(row = malloc(rowlen * sizeof(uint16_t {
+   free(im->data);
+   im->data = NULL;
+   free(row);
+   fclose(f);
+   return 0;
+   }
+
+   dat = (uint8_t *)im->data;
+   for (i = 0; i < h; i++, dat += rowlen) {
+   if (fread(row, sizeof(uint16_t), rowlen, f) !=
+   rowlen) {
+   free(im->data);
+   im->data =

[EGIT] [apps/terminology] master 01/03: update README to 0.9.1

2016-02-07 Thread Boris Faure

billiob pushed a commit to branch master.

http://git.enlightenment.org/apps/terminology.git/commit/?id=089bcbbc2b8b911ed9fd6a97b3426579c6e6dcc5

commit 089bcbbc2b8b911ed9fd6a97b3426579c6e6dcc5
Author: Boris Faure 
Date:   Sun Feb 7 16:28:19 2016 +0100

update README to 0.9.1
---
 README | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README b/README
index e2b71a9..7ceb812 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-Terminology 0.9.0
+Terminology 0.9.1
 
 **
 

--

[EGIT] [apps/terminology] master 02/03: we're in 2016!

2016-02-07 Thread Boris Faure

billiob pushed a commit to branch master.

http://git.enlightenment.org/apps/terminology.git/commit/?id=91842fee8acc81c2b7659dd7a5a8b2f490a250ed

commit 91842fee8acc81c2b7659dd7a5a8b2f490a250ed
Author: Boris Faure 
Date:   Sun Feb 7 16:29:43 2016 +0100

we're in 2016!
---
 COPYING | 2 +-
 src/bin/about.c | 2 +-
 src/bin/main.c  | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/COPYING b/COPYING
index 5e3dedf..1d5114c 100644
--- a/COPYING
+++ b/COPYING
@@ -1,6 +1,6 @@
 Copyright notice for Terminology (BSD 2-Clause License):
 
-Copyright (C) 2012-2015 Carsten Haitzler and various contributors (see AUTHORS)
+Copyright (C) 2012-2016 Carsten Haitzler and various contributors (see AUTHORS)
 
 All rights reserved.
 
diff --git a/src/bin/about.c b/src/bin/about.c
index 670f63e..d1608b2 100644
--- a/src/bin/about.c
+++ b/src/bin/about.c
@@ -69,7 +69,7 @@ about_toggle(Evas_Object *win, Evas_Object *bg, Evas_Object 
*term,
   ""
   "%s" // LICENSE
   ),
-  PACKAGE_VERSION, 2015,
+  PACKAGE_VERSION, 2016,
   "Boris Faure"
   "Carsten Haitzler"
   "Gustavo Sverzut Barbieri"
diff --git a/src/bin/main.c b/src/bin/main.c
index 09e2899..5a76422 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -403,7 +403,7 @@ static void
 _translate_options(void)
 {
options.copyright = eina_stringshare_printf(gettext(options.copyright),
-   2015);
+   2016);
 
Ecore_Getopt_Desc *desc = (Ecore_Getopt_Desc *) options.descs;
while ((desc->shortname != '\0') || (desc->longname)
@@ -580,7 +580,7 @@ elm_main(int argc, char **argv)
textdomain(PACKAGE);
_translate_options();
 #else
-   options.copyright = "(C) 2012-2015 Carsten Haitzler and others";
+   options.copyright = "(C) 2012-2016 Carsten Haitzler and others";
 #endif
 
_log_domain = eina_log_domain_register("terminology", NULL);

--

[EGIT] [apps/terminology] master 03/03: do not append \n at end of box selection

2016-02-07 Thread Boris Faure

billiob pushed a commit to branch master.

http://git.enlightenment.org/apps/terminology.git/commit/?id=b74cfc752a6d032fd4a6b280e8505be11f4451c3

commit b74cfc752a6d032fd4a6b280e8505be11f4451c3
Author: Boris Faure 
Date:   Sun Feb 7 18:15:00 2016 +0100

do not append \n at end of box selection
---
 src/bin/termio.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bin/termio.c b/src/bin/termio.c
index 3526b6e..20d5759 100644
--- a/src/bin/termio.c
+++ b/src/bin/termio.c
@@ -2341,7 +2341,7 @@ termio_take_selection(Evas_Object *obj, Elm_Sel_Type type)
  if (tmp)
{
   eina_strbuf_append_length(sb, tmp, len);
-  if (len && tmp[len - 1] != '\n')
+  if (len && tmp[len - 1] != '\n' && i != end_y)
 eina_strbuf_append_char(sb, '\n');
   free(tmp);
}

--

[EGIT] [bindings/python/python-efl] annotated tag v1.17.0 created (now 79b6d50)

2016-02-07 Thread Enlightenment Git

This is an automated email from the git hooks/post-receive script.

davemds pushed a change to annotated tag v1.17.0
in repository bindings/python/python-efl.

at  79b6d50   (tag)
   tagging  666817672096502a197bae021617348fde501b14 (commit)
  replaces  v1.16.0
 tagged by  Dave Andreoli
on  Sun Feb 7 20:06:34 2016 +0100

- Log -
tagging 1.17.0 release

Dave Andreoli (32):
  Open the 1.17 development phase
  A new ecore module: ecore_con
  just a note
  Add test/example for Genlist tree
  More tests on GenlistItem show/bring_in
  emotion test: remove an unwanted/unused import
  emotion test: another harmless leftover removed
  Implemented efl.Ethumb.Ethumb class.
  Revamp old and broken EthumbClient module
  oh, this is really important ...   :)
  Forgot since 1.17 in last commits
  ethumb test: more correct global usage
  Add a new module: ecore_input
  Moved (un)focused and language,changed events down to Object.
  ecore_con.Url: do not fail when receiving an event that is not for us.
  Gengrid: a small doc improvement
  Implemented Genlist filter ability
  New 1.17 API: edje size_class family functions
  New 1.17 API: elm.Configuration.context_menu_disabled
  whops, forgot to commit this file in a previous commit
  New 1.17 API: edje.Edje.text_class_del()
  New 1.17 API: edje.Edje.color_class_clear()
  New elm widget: Combobox
  New 1.17 API: ELM_GEN[GRID/LIST]_ITEM_SCROLLTO_BOTTOM
  New 1.17 API: elm.Ctxpopup "geometry,update" smart cb
  New 1.17 API: elm.Configuration.profile_* family functions
  New 1.17 API: elm.Popup.dismiss()
  New 1.17 API: elm.Notity.dismiss()
  New 1.17 API: evas.Object.paragraph_direction
  just a bit of indentation
  fix the url for the remote image test
  Prepare the 1.17 release

Kai Huuhko (17):
  Elementary: Implement drag and drop
  print()--
  Elementary.dnd: Fix various leftover issues
  api_coverage.py: Include all files in cdef search
  Ecore.Exe: Add missing documentation for the Events
  utils.deprecated: Fix compatibility with Python 3.5
  Eo: Add a private dict which can be used for callbacks etc.
  Elementary: Use the private internal_data dict instead of abusing user 
data dict
  Edje: Make ExternalParam_from_ptr a C only function
  Trivial todo note updates and doc fix
  Elm.MultiButtonEntry: Attempt to fix leaks, add more docs
  Elm.MultiButtonEntry: Fix filter callback
  Clean up cruft code
  Elm.FileSelector: Fix ref leak
  Elm.MultiButtonEntry: Correct documentation
  Elm.Genlist: Add small optimizations for filter and state cbs
  Update TODO

---

No new revisions were added by this update.

--

[EGIT] [bindings/python/python-efl] master 01/01: Open the 1.18 development cycle

2016-02-07 Thread Dave Andreoli

davemds pushed a commit to branch master.

http://git.enlightenment.org/bindings/python/python-efl.git/commit/?id=b6f729dc3ad22d91b4c773b573db133cf607ac2c

commit b6f729dc3ad22d91b4c773b573db133cf607ac2c
Author: Dave Andreoli 
Date:   Sun Feb 7 20:22:44 2016 +0100

Open the 1.18 development cycle
---
 efl/__init__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/efl/__init__.py b/efl/__init__.py
index 32fd3b9..af2b71d 100644
--- a/efl/__init__.py
+++ b/efl/__init__.py
@@ -20,5 +20,5 @@
 # pre-release: "1.13.0-beta1" ( 1, 13, 0 )
 # release: "1.13.0" ( 1, 13, 0 )
 
-__version__ = "1.17.0"
-__version_info__ = ( 1, 17, 0 )
+__version__ = "1.17.99"
+__version_info__ = ( 1, 17, 99 )

--

[EGIT] [legacy/imlib2] master 02/02: Indent.

[EGIT] [legacy/imlib2] master 01/02: Add a Farbfeld loader

[EGIT] [apps/terminology] master 01/03: update README to 0.9.1

[EGIT] [apps/terminology] master 02/03: we're in 2016!

[EGIT] [apps/terminology] master 03/03: do not append \n at end of box selection

[EGIT] [bindings/python/python-efl] annotated tag v1.17.0 created (now 79b6d50)

[EGIT] [bindings/python/python-efl] master 01/01: Open the 1.18 development cycle

7 matches

Site Navigation

Mail list logo

Footer information