Hello community,

here is the log from the commit of package logstalgia for openSUSE:Factory 
checked in at 2017-07-17 09:12:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/logstalgia (Old)
 and      /work/SRC/openSUSE:Factory/.logstalgia.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "logstalgia"

Mon Jul 17 09:12:41 2017 rev:3 rq:510485 version:1.0.7

Changes:
--------
--- /work/SRC/openSUSE:Factory/logstalgia/logstalgia.changes    2017-02-04 
18:01:23.088669618 +0100
+++ /work/SRC/openSUSE:Factory/.logstalgia.new/logstalgia.changes       
2017-07-17 09:12:42.582825119 +0200
@@ -1,0 +2,9 @@
+Sat Jul 15 10:21:06 UTC 2017 - astie...@suse.com
+
+- logstalgia 1.0.7:
+ * Added window frame toggle (F11).
+ * Fixed crash when taking a screenshot with an odd resolution.
+ * Handle exception when user defined regular expression is invalid.
+ * Fixed --hide-url-prefix not working
+
+-------------------------------------------------------------------

Old:
----
  logstalgia-1.0.6.tar.gz

New:
----
  logstalgia-1.0.7.tar.gz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ logstalgia.spec ++++++
--- /var/tmp/diff_new_pack.3vlYbv/_old  2017-07-17 09:12:43.246731604 +0200
+++ /var/tmp/diff_new_pack.3vlYbv/_new  2017-07-17 09:12:43.250731040 +0200
@@ -17,27 +17,27 @@
 
 
 Name:           logstalgia
-Version:        1.0.6
+Version:        1.0.7
 Release:        0
 Summary:        A website access log visualization tool
 License:        GPL-3.0+
 Group:          Amusements/Toys/Other
-Url:            http://code.google.com/p/logstalgia/
-Source:         
https://github.com/acaudwell/Logstalgia/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz
-%if 0%{?suse_version} > 1325
-BuildRequires:  libboost_headers-devel
-%else
-BuildRequires:  boost-devel > 1.46
-%endif
+Url:            http://logstalgia.io/
+Source:         
https://github.com/acaudwell/Logstalgia/releases/download/logstalgia-%{version}/%{name}-%{version}.tar.gz
 BuildRequires:  ftgl-devel
 BuildRequires:  gcc-c++
 BuildRequires:  glew-devel
 BuildRequires:  glm-devel >= 0.9.3
 BuildRequires:  pcre-devel
+BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(freetype2) >= 9.0.3
 BuildRequires:  pkgconfig(libpng) >= 1.2
 Requires:       freefont
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+%if 0%{?suse_version} > 1325
+BuildRequires:  libboost_headers-devel
+%else
+BuildRequires:  boost-devel > 1.46
+%endif
 %if 0%{?suse_version} >= 1310
 BuildRequires:  pkgconfig(SDL2_image) >= 2.0
 BuildRequires:  pkgconfig(sdl2) >= 2.0
@@ -67,9 +67,8 @@
 %make_install
 
 %files
-%defattr(-,root,root)
 %doc COPYING README THANKS ChangeLog
-%doc %{_mandir}/man1/logstalgia*
+%{_mandir}/man1/logstalgia*
 %{_bindir}/logstalgia
 %{_datadir}/logstalgia/
 

++++++ logstalgia-1.0.6.tar.gz -> logstalgia-1.0.7.tar.gz ++++++
++++ 2085 lines of diff (skipped)
++++    retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/logstalgia-1.0.6/ChangeLog new/logstalgia-1.0.7/ChangeLog
--- old/logstalgia-1.0.6/ChangeLog      2014-10-16 03:57:11.000000000 +0200
+++ new/logstalgia-1.0.7/ChangeLog      2015-10-20 22:32:08.000000000 +0200
@@ -1,3 +1,10 @@
+1.0.7:
+ * Added window frame toggle (F11).
+ * Fixed crash loading large log files on Windows.
+ * Fixed crash when taking a screenshot with an odd resolution.
+ * Handle exception when user defined regular expression is invalid.
+ * Fixed --hide-url-prefix not working (jettero).
+
 1.0.6:
  * Display invalid requests as having the path '???'.
  * Updated the boost autoconf macro.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/logstalgia-1.0.6/README new/logstalgia-1.0.7/README
--- old/logstalgia-1.0.6/README 2014-10-16 03:57:08.000000000 +0200
+++ new/logstalgia-1.0.7/README 2015-10-20 22:32:05.000000000 +0200
@@ -5,7 +5,7 @@
 
                  Copyright (C) 2008 Andrew Caudwell
 
-                http://code.google.com/p/logstalgia/
+                        http://logstalgia.io
 
 Contents
 ========
@@ -235,7 +235,7 @@
 
 See the guide on the homepage for examples of recording videos with Logstalgia:
 
-    http://code.google.com/p/logstalgia/wiki/Videos
+    https://github.com/acaudwell/Logstalgia/wiki/Videos
 
 Interface:
 
@@ -254,6 +254,7 @@
    (N)   Jump forward in time to next log entry
    (+-)  Adjust simulation speed
    (<>)  Adjust pitch speed
+   (F11) Window frame toggle
    (F12) Screenshot
    (Alt+Enter) Fullscreen toggle
    (ESC) Quit
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/logstalgia-1.0.6/build-aux/compile new/logstalgia-1.0.7/build-aux/compile
--- old/logstalgia-1.0.6/build-aux/compile      2014-10-16 03:57:11.000000000 
+0200
+++ new/logstalgia-1.0.7/build-aux/compile      2015-10-20 22:32:08.000000000 
+0200
@@ -3,7 +3,7 @@
 
 scriptversion=2012-10-14.11; # UTC
 
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 # Written by Tom Tromey <tro...@cygnus.com>.
 #
 # This program is free software; you can redistribute it and/or modify
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/logstalgia-1.0.6/build-aux/missing new/logstalgia-1.0.7/build-aux/missing
--- old/logstalgia-1.0.6/build-aux/missing      2014-10-16 03:57:11.000000000 
+0200
+++ new/logstalgia-1.0.7/build-aux/missing      2015-10-20 22:32:08.000000000 
+0200
@@ -3,7 +3,7 @@
 
 scriptversion=2013-10-28.13; # UTC
 
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
 # Originally written by Fran,cois Pinard <pin...@iro.umontreal.ca>, 1996.
 
 # This program is free software; you can redistribute it and/or modify
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/logstalgia-1.0.6/configure.ac new/logstalgia-1.0.7/configure.ac
--- old/logstalgia-1.0.6/configure.ac   2014-10-16 03:57:08.000000000 +0200
+++ new/logstalgia-1.0.7/configure.ac   2015-10-20 22:32:05.000000000 +0200
@@ -3,7 +3,7 @@
 
 AC_PREREQ(2.61)
 
-AC_INIT(Logstalgia, 1.0.6, [acaudw...@gmail.com])
+AC_INIT(Logstalgia, 1.0.7, [acaudw...@gmail.com])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_SRCDIR([src/main.cpp])
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/logstalgia-1.0.6/data/logstalgia.1 new/logstalgia-1.0.7/data/logstalgia.1
--- old/logstalgia-1.0.6/data/logstalgia.1      2014-10-16 03:57:08.000000000 
+0200
+++ new/logstalgia-1.0.7/data/logstalgia.1      2015-10-20 22:32:05.000000000 
+0200
@@ -221,7 +221,7 @@
 See the guide on the homepage for examples of recording videos with Logstalgia:
 
 .ti 10
-http://code.google.com/p/logstalgia/wiki/Videos
+https://github.com/acaudwell/Logstalgia/wiki/Videos
 
 .SH INTERFACE
 The time shown in the top left of the screen is set initially from the first 
log entry read and is incremented according to the simulation speed (\-s).
@@ -243,6 +243,8 @@
 .ti 10
 (<>) Adjust pitch speed.
 .ti 10
+(F11) Window frame toggle
+.ti 10
 (F12) Screenshot
 .ti 10
 (Alt+Enter) Fullscreen toggle
@@ -253,7 +255,7 @@
 .nf
  Written by Andrew Caudwell
 
- Project Homepage: http://code.google.com/p/logstalgia/
+ Project Homepage: http://logstalgia.io
 .SH COPYRIGHT
 .nf
  Copyright (C) 2008 Andrew Caudwell (acaudw...@gmail.com)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/logstalgia-1.0.6/src/core/display.cpp 
new/logstalgia-1.0.7/src/core/display.cpp
--- old/logstalgia-1.0.6/src/core/display.cpp   2014-10-16 03:57:08.000000000 
+0200
+++ new/logstalgia-1.0.7/src/core/display.cpp   2015-10-20 22:32:05.000000000 
+0200
@@ -53,6 +53,11 @@
 #if SDL_VERSION_ATLEAST(2,0,0)
     sdl_window = 0;
     gl_context = 0;
+
+    framed_width  = 0;
+    framed_height = 0;
+    framed_x      = 0;
+    framed_y      = 0;
 #else
     surface = 0;
 #endif
@@ -75,7 +80,7 @@
     Uint32 flags = SDL_WINDOW_OPENGL | SDL_WINDOW_SHOWN;
 
     if (frameless) flags |= SDL_WINDOW_BORDERLESS;
-    if (resizable) flags |= SDL_WINDOW_RESIZABLE;
+    if (resizable && !frameless) flags |= SDL_WINDOW_RESIZABLE;
     if (fullscreen) flags |= SDL_WINDOW_FULLSCREEN;
 #else
     Uint32 flags = SDL_OPENGL | SDL_HWSURFACE | SDL_ANYFORMAT | SDL_DOUBLEBUF;
@@ -99,6 +104,10 @@
     this->resizable = resizable;
 }
 
+void SDLAppDisplay::enableFrameless(bool frameless) {
+    this->frameless = frameless;
+}
+
 void SDLAppDisplay::enableAlpha(bool enable) {
     enable_alpha = enable;
 }
@@ -149,17 +158,31 @@
         SDL_GL_SetAttribute(SDL_GL_MULTISAMPLEBUFFERS, 1);
         SDL_GL_SetAttribute(SDL_GL_MULTISAMPLESAMPLES, (GLuint) multi_sample);
     }
-    
+
     if(enable_alpha) {
         SDL_GL_SetAttribute(SDL_GL_ALPHA_SIZE, 8);
     }
-    
+
     Uint32 flags = SDLWindowFlags(fullscreen);
 
     if(gl_context != 0) SDL_GL_DeleteContext(gl_context);
-    if(sdl_window != 0) SDL_DestroyWindow(sdl_window);
 
-    sdl_window = SDL_CreateWindow(gSDLAppTitle.c_str(), 
SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, width, height, flags);
+
+    int display_index = -1;
+    int position_x, position_y;
+
+    if(sdl_window != 0) {
+        display_index = SDL_GetWindowDisplayIndex(sdl_window);
+        SDL_GetWindowPosition(sdl_window, &position_x, &position_y);
+        SDL_DestroyWindow(sdl_window);
+    }
+
+    if(display_index != -1) {
+        sdl_window = SDL_CreateWindow(gSDLAppTitle.c_str(), 
SDL_WINDOWPOS_UNDEFINED_DISPLAY(display_index), 
SDL_WINDOWPOS_UNDEFINED_DISPLAY(display_index), width, height, flags);
+        SDL_SetWindowPosition(sdl_window, position_x, position_y);
+    } else {
+        sdl_window = SDL_CreateWindow(gSDLAppTitle.c_str(), 
SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, width, height, flags);
+    }
 
     if (!sdl_window) {
 
@@ -169,7 +192,12 @@
             SDL_GL_SetAttribute(SDL_GL_MULTISAMPLEBUFFERS, 0);
             SDL_GL_SetAttribute(SDL_GL_MULTISAMPLESAMPLES, 0);
 
-            sdl_window = SDL_CreateWindow(gSDLAppTitle.c_str(), 
SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, width, height, flags);
+            if(display_index != -1) {
+                sdl_window = SDL_CreateWindow(gSDLAppTitle.c_str(), 
SDL_WINDOWPOS_UNDEFINED_DISPLAY(display_index), 
SDL_WINDOWPOS_UNDEFINED_DISPLAY(display_index), width, height, flags);
+                SDL_SetWindowPosition(sdl_window, position_x, position_y);
+            } else {
+                sdl_window = SDL_CreateWindow(gSDLAppTitle.c_str(), 
SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, width, height, flags);
+            }
         }
 
         if(!sdl_window) {
@@ -319,6 +347,67 @@
     this->height = resized_height;
 }
 
+void SDLAppDisplay::toggleFrameless() {
+#if SDL_VERSION_ATLEAST(2,0,0)
+    if(fullscreen) return;
+
+    frameless = !frameless;
+
+    if(frameless) {
+
+        int position_x, position_y;
+        SDL_GetWindowPosition(sdl_window, &position_x, &position_y);
+
+        framed_width  = width;
+        framed_height = height;
+        framed_x      = position_x;
+        framed_y      = position_y;
+
+#ifdef _WIN32
+        SDL_SysWMinfo sys_window_info;
+        SDL_VERSION(&sys_window_info.version);
+
+        if(SDL_GetWindowWMInfo(sdl_window, &sys_window_info)) {
+
+            //make the new window equal the size of the old window including 
frame
+
+            HWND wnd = sys_window_info.info.win.window;
+
+            RECT rect;
+            GetWindowRect(wnd, &rect);
+
+            position_x = rect.left;
+            position_y = rect.top;
+
+            width  = rect.right - rect.left;
+            height = rect.bottom - rect.top;
+        }
+#endif
+
+        //work around window position changing when when frame is toggled
+        //related bug: https://bugzilla.libsdl.org/show_bug.cgi?id=2791
+
+        SDL_SetWindowBordered(sdl_window, SDL_FALSE);
+        SDL_SetWindowSize(sdl_window, width, height);
+        SDL_SetWindowPosition(sdl_window, position_x, position_y);
+
+        //window needs to be recreated to remove SDL_WINDOW_RESIZABLE flag
+        //otherwise there is still a weird border
+
+        setVideoMode(width, height, fullscreen);
+
+    } else {
+        width  = framed_width;
+        height = framed_height;
+
+        SDL_SetWindowBordered(sdl_window, SDL_TRUE);
+        SDL_SetWindowSize(sdl_window, width, height);
+        SDL_SetWindowPosition(sdl_window, framed_x, framed_y);
+        setVideoMode(width, height, fullscreen);
+    }
+#endif
+}
+
 void SDLAppDisplay::resize(int width, int height) {
 
     int resized_width, resized_height;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/logstalgia-1.0.6/src/core/display.h new/logstalgia-1.0.7/src/core/display.h
--- old/logstalgia-1.0.6/src/core/display.h     2014-10-16 03:57:08.000000000 
+0200
+++ new/logstalgia-1.0.7/src/core/display.h     2015-10-20 22:32:05.000000000 
+0200
@@ -76,6 +76,9 @@
 #if SDL_VERSION_ATLEAST(2,0,0)
     SDL_Window*   sdl_window;
     SDL_GLContext gl_context;
+
+    int framed_width, framed_height;
+    int framed_x, framed_y;
 #else
     SDL_Surface *surface;
 #endif
@@ -88,6 +91,9 @@
 
     void   getFullscreenResolution(int& width, int& height);
     void   toggleFullscreen();
+
+    void   toggleFrameless();
+
     void   resize(int width, int height);
 
     void   init(std::string window_title, int width, int height, bool 
fullscreen);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/logstalgia-1.0.6/src/core/mousecursor.cpp 
new/logstalgia-1.0.7/src/core/mousecursor.cpp
--- old/logstalgia-1.0.6/src/core/mousecursor.cpp       2014-10-16 
03:57:08.000000000 +0200
+++ new/logstalgia-1.0.7/src/core/mousecursor.cpp       2015-10-20 
22:32:05.000000000 +0200
@@ -34,20 +34,20 @@
     timeout       = 3.0f;
     idle          = timeout;
     scrollwheel   = 0;
-    
+
     left_click   = false;
     right_click  = false;
     middle_click = false;
-    
+
     sdl_default_cursor = SDL_GetCursor();
-    
-    
+
+
     Uint8 data[4*32];
     Uint8 mask[4*32];
-    
+
     memset(data, 0, sizeof(data));
     memset(mask, 0, sizeof(mask));
-  
+
     sdl_hidden_cursor = SDL_CreateCursor(data, mask, 32, 32, 0, 0);
 }
 
@@ -78,6 +78,17 @@
         else SDL_SetCursor(sdl_hidden_cursor);
     }
 }
+const vec2& MouseCursor::getPos() const {
+    return mousepos;
+}
+
+const vec2& MouseCursor::getRelativePos() const {
+    return rel;
+}
+
+void MouseCursor::updateRelativePos(const vec2& rel) {
+    this->rel = rel;
+}
 
 void MouseCursor::leftClick(bool click) {
     left_click = click;
@@ -96,7 +107,7 @@
 }
 
 bool MouseCursor::rightClick() const {
-    return right_click;    
+    return right_click;
 }
 
 bool MouseCursor::middleClick() const {
@@ -124,7 +135,7 @@
 }
 
 int MouseCursor::scrollWheel() const {
-    return scrollwheel;    
+    return scrollwheel;
 }
 
 bool MouseCursor::isSystemCursor() const {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/logstalgia-1.0.6/src/core/mousecursor.h 
new/logstalgia-1.0.7/src/core/mousecursor.h
--- old/logstalgia-1.0.6/src/core/mousecursor.h 2014-10-16 03:57:08.000000000 
+0200
+++ new/logstalgia-1.0.7/src/core/mousecursor.h 2015-10-20 22:32:05.000000000 
+0200
@@ -33,15 +33,16 @@
 class MouseCursor {
 
     vec2 mousepos;
+    vec2 rel;
 
     bool hidden;
     bool system_cursor;
 
     float idle;
     float timeout;
-    
+
     int scrollwheel;
-    
+
     SDL_Cursor* sdl_default_cursor;
     SDL_Cursor* sdl_hidden_cursor;
 
@@ -53,8 +54,9 @@
 public:
     MouseCursor();
     ~MouseCursor();
-    
-    vec2 getPos() const { return mousepos; }
+
+    const vec2& getPos() const;
+    const vec2& getRelativePos() const;
 
     void leftClick(bool click);
     void rightClick(bool click);
@@ -63,14 +65,14 @@
     bool leftClick() const;
     bool rightClick() const;
     bool middleClick() const;
-    
+
     bool leftButtonPressed() const;
     bool rightButtonPressed() const;
     bool bothPressed() const;
     bool buttonPressed() const;
 
     int scrollWheel() const;
-    
+
     bool isHidden() const;
     bool isSystemCursor()const;
     bool isVisible() const;
@@ -80,6 +82,7 @@
 
     void resetButtonState();
 
+    void updateRelativePos(const vec2& rel);
     void updatePos(const vec2& pos);
 
     void showCursor(bool show);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/logstalgia-1.0.6/src/core/png_writer.cpp 
new/logstalgia-1.0.7/src/core/png_writer.cpp
--- old/logstalgia-1.0.6/src/core/png_writer.cpp        2014-10-16 
03:57:08.000000000 +0200
+++ new/logstalgia-1.0.7/src/core/png_writer.cpp        2015-10-20 
22:32:05.000000000 +0200
@@ -74,6 +74,7 @@
 
 void PNGWriter::capture(std::vector<char>& buffer) {
     GLenum pixel_format = components == 4 ? GL_RGBA : GL_RGB;
+    glPixelStorei(GL_PACK_ALIGNMENT, 1);
     glReadPixels(0, 0, display.width, display.height, pixel_format, 
GL_UNSIGNED_BYTE, &(buffer[0]));
 }
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/logstalgia-1.0.6/src/core/ppm.cpp new/logstalgia-1.0.7/src/core/ppm.cpp
--- old/logstalgia-1.0.6/src/core/ppm.cpp       2014-10-16 03:57:08.000000000 
+0200
+++ new/logstalgia-1.0.7/src/core/ppm.cpp       2015-10-20 22:32:05.000000000 
+0200
@@ -96,6 +96,7 @@
     char* next_pixel_ptr = (pixels_shared_ptr == pixels1) ? pixels2 : pixels1;
 
     // copy pixels - now the right way up
+    glPixelStorei(GL_PACK_ALIGNMENT, 1);
     glReadPixels(0, 0, display.width, display.height,
         GL_RGB, GL_UNSIGNED_BYTE, next_pixel_ptr);
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/logstalgia-1.0.6/src/core/seeklog.cpp 
new/logstalgia-1.0.7/src/core/seeklog.cpp
--- old/logstalgia-1.0.6/src/core/seeklog.cpp   2014-10-16 03:57:08.000000000 
+0200
+++ new/logstalgia-1.0.7/src/core/seeklog.cpp   2015-10-20 22:32:05.000000000 
+0200
@@ -27,7 +27,7 @@
 
 #include "seeklog.h"
 
-long gSeekLogMaxBufferSize = 104857600;
+long long gSeekLogMaxBufferSize = 104857600;
 
 //StreamLog
 
@@ -107,6 +107,7 @@
     if(stream!=0) delete stream;
 
     std::ifstream* file = new std::ifstream(logfile.c_str(), std::ios::in | 
std::ios::binary | std::ios::ate);
+
     file_size = file->tellg();
 
     if(!file->is_open()) return false;
@@ -119,6 +120,7 @@
         return true;
     }
 
+
     //buffer entire file into memory
     char* filebuffer = new char[file_size+1];
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/logstalgia-1.0.6/src/core/seeklog.h new/logstalgia-1.0.7/src/core/seeklog.h
--- old/logstalgia-1.0.6/src/core/seeklog.h     2014-10-16 03:57:08.000000000 
+0200
+++ new/logstalgia-1.0.7/src/core/seeklog.h     2015-10-20 22:32:05.000000000 
+0200
@@ -74,7 +74,7 @@
 
     std::string logfile;
 
-    long file_size;
+    long long file_size;
     float current_percent;
 
     bool readFully();
@@ -93,6 +93,6 @@
     bool isFinished();
 };
 
-extern long gSeekLogMaxBufferSize;
+extern long long gSeekLogMaxBufferSize;
 
 #endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/logstalgia-1.0.6/src/core/shader.cc new/logstalgia-1.0.7/src/core/shader.cc
--- old/logstalgia-1.0.6/src/core/shader.cc     2014-10-16 03:57:08.000000000 
+0200
+++ new/logstalgia-1.0.7/src/core/shader.cc     2015-10-20 22:32:05.000000000 
+0200
@@ -28,10 +28,7 @@
 #include <boost/format.hpp>
 #include <stdarg.h>
 
-#ifdef USE_MGL_NAMESPACE
-#define GL_GLEXT_PROTOTYPES
-#include "../MGL/osmesa.h"
-#else
+#ifndef USE_MGL_NAMESPACE
 #include "gl.h"
 #endif
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/logstalgia-1.0.6/src/core/shader_common.cpp 
new/logstalgia-1.0.7/src/core/shader_common.cpp
--- old/logstalgia-1.0.6/src/core/shader_common.cpp     2014-10-16 
03:57:08.000000000 +0200
+++ new/logstalgia-1.0.7/src/core/shader_common.cpp     2015-10-20 
22:32:05.000000000 +0200
@@ -614,20 +614,19 @@
     char buff[1024];
 
     if(baked) {
-        snprintf(buff, 1024, "%s[%ld] %s = %s[] (\n", type_name.c_str(), 
length, name.c_str(), type_name.c_str());
+        content.append(str(boost::format("%s[%d] %s = %s[] (\n") % type_name % 
length % name % type_name));
 
         content += buff;
 
         for(size_t i=0; i<length; i++) {
-            snprintf(buff, 1024, "    %s(%e, %e)", type_name.c_str(), 
value[i].x, value[i].y);
-            content += buff;
+            content.append(str(boost::format("    %s(%e, %e)") % type_name % 
value[i].x % value[i].y));
+
             if(i<length-1) content += ",\n";
             else           content += "\n);\n";
         }
 
     } else {
-        snprintf(buff, 1024, "uniform %s %s[%ld];\n", type_name.c_str(), 
name.c_str(), length);
-        content += buff;
+        content.append(str(boost::format("uniform %s %s[%d];\n") % type_name % 
name % length));
     }
 }
 
@@ -707,20 +706,17 @@
     char buff[1024];
 
     if(baked) {
-        snprintf(buff, 1024, "%s[%ld] %s = %s[] (\n", type_name.c_str(), 
length, name.c_str(), type_name.c_str());
-
-        content += buff;
+        content.append(str(boost::format("%s[%d] %s = %s[] (\n") % type_name % 
length % name % type_name));
 
         for(size_t i=0; i<length; i++) {
-            snprintf(buff, 1024, "    %s(%e, %e, %e)", type_name.c_str(), 
value[i].x, value[i].y, value[i].z);
-            content += buff;
+            content.append(str(boost::format("    %s(%e, %e, %e)") % type_name 
% value[i].x % value[i].y % value[i].z));
+
             if(i<length-1) content += ",\n";
             else           content += "\n);\n";
         }
 
     } else {
-        snprintf(buff, 1024, "uniform %s %s[%ld];\n", type_name.c_str(), 
name.c_str(), length);
-        content += buff;
+        content.append(str(boost::format("uniform %s %s[%d];\n") % type_name % 
name % length));
     }
 }
 
@@ -800,20 +796,17 @@
     char buff[1024];
 
     if(baked) {
-        snprintf(buff, 1024, "%s[%ld] %s = %s[] (\n", type_name.c_str(), 
length, name.c_str(), type_name.c_str());
-
-        content += buff;
+        content.append(str(boost::format("%s[%d] %s = %s[] (\n") % type_name % 
length % name % type_name));
 
         for(size_t i=0; i<length; i++) {
-            snprintf(buff, 1024, "    %s(%e, %e, %e, %e)", type_name.c_str(), 
value[i].x, value[i].y, value[i].z, value[i].w);
-            content += buff;
+            content.append(str(boost::format("    %s(%e, %e, %e, %e)") % 
type_name % value[i].x % value[i].y % value[i].z % value[i].w));
+
             if(i<length-1) content += ",\n";
             else           content += "\n);\n";
         }
 
     } else {
-        snprintf(buff, 1024, "uniform %s %s[%ld];\n", type_name.c_str(), 
name.c_str(), length);
-        content += buff;
+        content.append(str(boost::format("uniform %s %s[%d];\n") % type_name % 
name % length));
     }
 
 }
@@ -1068,6 +1061,7 @@
         delete it->second;
     }
     uniforms.clear();
+    uniform_list.clear();
 
     if(vertex_shader != 0)   delete vertex_shader;
     if(geometry_shader != 0) delete geometry_shader;
@@ -1131,6 +1125,7 @@
     }
 
     uniforms[uniform->getName()] = uniform;
+    uniform_list.push_back(uniform);
 }
 
 ShaderUniform* AbstractShader::getUniform(const std::string& name) {
@@ -1343,10 +1338,8 @@
 }
 
 
-void AbstractShader::getUniforms(std::list<ShaderUniform*>& uniform_list) {
-    for(std::map<std::string, ShaderUniform*>::iterator it= uniforms.begin(); 
it!=uniforms.end();it++) {
-        uniform_list.push_back(it->second);
-    }
+const std::list<ShaderUniform*>& AbstractShader::getUniforms() {
+    return uniform_list;
 }
 
 void AbstractShader::applyUniforms() {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/logstalgia-1.0.6/src/core/shader_common.h 
new/logstalgia-1.0.7/src/core/shader_common.h
--- old/logstalgia-1.0.6/src/core/shader_common.h       2014-10-16 
03:57:08.000000000 +0200
+++ new/logstalgia-1.0.7/src/core/shader_common.h       2015-10-20 
22:32:05.000000000 +0200
@@ -363,6 +363,7 @@
 class AbstractShader : public Resource {
 protected:
     std::map<std::string, ShaderUniform*>  uniforms;
+    std::list<ShaderUniform*> uniform_list;
     std::map<std::string,std::string> substitutions;
 
     std::string prefix;
@@ -405,7 +406,7 @@
     void setDynamicCompile(bool dynamic_compile);
     bool needsCompile();
 
-    void getUniforms(std::list<ShaderUniform*>& uniform_list);
+    const std::list<ShaderUniform*>& getUniforms();
 
     void applyUniforms();
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/logstalgia-1.0.6/src/logstalgia.cpp new/logstalgia-1.0.7/src/logstalgia.cpp
--- old/logstalgia-1.0.6/src/logstalgia.cpp     2014-10-16 03:57:08.000000000 
+0200
+++ new/logstalgia-1.0.7/src/logstalgia.cpp     2015-10-20 22:32:05.000000000 
+0200
@@ -205,6 +205,10 @@
             togglePause();
         }
 
+        if (e->keysym.sym == SDLK_F11) {
+            toggleWindowFrame();
+        }
+
         if (e->keysym.sym == SDLK_F12) {
             take_screenshot = true;
         }
@@ -716,6 +720,25 @@
     reinit();
 }
 
+void Logstalgia::toggleWindowFrame() {
+#if SDL_VERSION_ATLEAST(2,0,0)
+    if(display.fullscreen) return;
+    if(frameExporter != 0) return;
+
+    texturemanager.unload();
+    shadermanager.unload();
+    fontmanager.unload();
+
+    display.toggleFrameless();
+
+    texturemanager.reload();
+    shadermanager.reload();
+    fontmanager.reload();
+
+    reinit();
+#endif
+}
+
 void Logstalgia::reinit() {
     initPaddles();
     initRequestBalls();
@@ -1109,7 +1132,15 @@
         percent = remaining_percent;
     }
 
-    Summarizer* summarizer = new Summarizer(fontSmall, percent, 
settings.update_rate, groupregex, grouptitle);
+
+    Summarizer* summarizer = 0;
+
+    try {
+        summarizer = new Summarizer(fontSmall, percent, settings.update_rate, 
groupregex, grouptitle);
+    }
+    catch(RegexCompilationException& e) {
+        throw SDLAppException("invalid regular expression for group '%s'", 
grouptitle.c_str());
+    }
 
     if(glm::dot(colour, colour) > 0.01f) {
         summarizer->setColour(colour);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/logstalgia-1.0.6/src/logstalgia.h new/logstalgia-1.0.7/src/logstalgia.h
--- old/logstalgia-1.0.6/src/logstalgia.h       2014-10-16 03:57:08.000000000 
+0200
+++ new/logstalgia-1.0.7/src/logstalgia.h       2015-10-20 22:32:05.000000000 
+0200
@@ -172,6 +172,7 @@
     void setBackground(vec3 background);
 
     void resize(int width, int height);
+    void toggleWindowFrame();
 
     //inherited methods
     void init();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/logstalgia-1.0.6/src/settings.cpp new/logstalgia-1.0.7/src/settings.cpp
--- old/logstalgia-1.0.6/src/settings.cpp       2014-10-16 03:57:08.000000000 
+0200
+++ new/logstalgia-1.0.7/src/settings.cpp       2015-10-20 22:32:05.000000000 
+0200
@@ -144,6 +144,7 @@
     arg_types["hide-paddle"]        = "bool";
     arg_types["hide-paddle-tokens"] = "bool";
     arg_types["hide-response-code"] = "bool";
+    arg_types["hide-url-prefix"]    = "bool";
 
     arg_types["disable-auto-skip"] = "bool";
     arg_types["disable-progress"]  = "bool";
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/logstalgia-1.0.6/src/settings.h new/logstalgia-1.0.7/src/settings.h
--- old/logstalgia-1.0.6/src/settings.h 2014-10-16 03:57:08.000000000 +0200
+++ new/logstalgia-1.0.7/src/settings.h 2015-10-20 22:32:05.000000000 +0200
@@ -18,7 +18,7 @@
 #ifndef LOGSTALGIA_SETTINGS_H
 #define LOGSTALGIA_SETTINGS_H
 
-#define LOGSTALGIA_VERSION "1.0.6"
+#define LOGSTALGIA_VERSION "1.0.7"
 
 #include "core/settings.h"
 


Reply via email to