Merge lp:~vanvugt/mir/typo-is-not-an-example into lp:mir

[Daniel van Vugt]

Rename namespace mir::examples::typo -> mir::typo

Because it's not an example. In fact, libtypo is designed to not depend
on Mir-anything at all. It could even become an external project later
(with a different name, because the current one is not unique enough).

[Mir CI Bot (mir-ci-bot)]

PASSED: Continuous integration, rev:3745
https://mir-jenkins.ubuntu.com/job/mir-ci/1909/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/2424
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/2487
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2479
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2479
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2479
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/2453
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/2453/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/2453
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/2453/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/2453
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/2453/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/2453
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/2453/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/2453
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/2453/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/2453
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/2453/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/1909/rebuild

review: Approve (continuous-integration)

[Alan Griffiths (alan-griffiths)]

I don't have any problem with moving or publishing this functionality, but I don't find the interface particularly attractive. Could we first tidy that up?

review: Needs Information

[Alan Griffiths (alan-griffiths)]

> I don't have any problem with moving or publishing this functionality, but I
> don't find the interface particularly attractive. Could we first tidy that up?

I mean stuff like: Renderer::Image having public data and being copyable. Both of which make it easy to get undefined behaviour.

[Cemil Azizoglu (cemil-azizoglu)]

This is not publishing it so ok by me. Perhaps Alan's comments apply to the other branch.

review: Approve

[Daniel van Vugt (vanvugt)]

Sounds like something that's easy to fix in a separate independent branch...

[Mir CI Bot (mir-ci-bot)]

FAILED: Autolanding.
More details in the following jenkins job:
https://mir-jenkins.ubuntu.com/job/mir-autolanding/665/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/2446/console
    None: https://mir-jenkins.ubuntu.com/job/generic-land-mp/706/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/2509
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2501
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2501
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2501
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/2475/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/2475
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/2475/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/2475/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/2475
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/2475/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/2475
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/2475/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/2475
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/2475/artifact/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

^^^
Archive sync problems again.

03:48:43 W: No sandbox user '_apt' on the system, can not drop privileges
03:48:43 E: Failed to fetch http://archive.ubuntu.com/ubuntu/pool/main/g/gcc-6/libobjc4_6.2.0-5ubuntu11_amd64.deb 404 Not Found [IP: 91.189.92.201 80]
03:48:43 E: Failed to fetch http://archive.ubuntu.com/ubuntu/pool/main/g/gcc-6/libobjc-6-dev_6.2.0-5ubuntu11_amd64.deb 404 Not Found [IP: 91.189.92.201 80]
03:48:43 E: Unable to fetch some archives, maybe run apt-get update or try with --fix-missing?

[Daniel van Vugt (vanvugt)]

Alan:
I see what you mean although differ in opinion. I personally tend toward the simpler (less idiotproof) code than strengthening it, given that Image is implicitly for internal use only. External users go through GLCache instead and never deal with Image. But here tis:
  https://code.launchpad.net/~vanvugt/mir/safer-typo-image/+merge/308020

[Alan Griffiths (alan-griffiths)]

> This is not publishing it so ok by me. Perhaps Alan's comments apply to the
> other branch.

"example" at least allows the inference this isn't production quality code. I'd prefer it cleaned up before we start that process.

[Alan Griffiths (alan-griffiths)]

> > This is not publishing it so ok by me. Perhaps Alan's comments apply to the
> > other branch.
>
> "example" at least allows the inference this isn't production quality code.
> I'd prefer it cleaned up before we start that process.

review: Needs Fixing

[Daniel van Vugt (vanvugt)]

That comment is irrationally passive aggressive. You're saying that a library that's never had any bugs is "not production quality" just because you don't like the style.

Although I did the clean up you requested, to me it feels much less clean.

[Mir CI Bot (mir-ci-bot)]

review: Approve (continuous-integration)

=== modified file 'playground/demo-shell/typo/typo_freetype_renderer.cpp'
--- playground/demo-shell/typo/typo_freetype_renderer.cpp	2015-02-27 03:22:32 +0000
+++ playground/demo-shell/typo/typo_freetype_renderer.cpp	2016-10-07 07:26:22 +0000
@@ -20,7 +20,7 @@
 #include <stdexcept>
 #include <cstring>
 
-using namespace mir::examples::typo;
+using namespace mir::typo;
 
 FreetypeRenderer::FreetypeRenderer()
     : lib(nullptr), face(nullptr), preferred_height(16)
 
=== modified file 'playground/demo-shell/typo/typo_freetype_renderer.h'
--- playground/demo-shell/typo/typo_freetype_renderer.h	2015-02-20 06:24:57 +0000
+++ playground/demo-shell/typo/typo_freetype_renderer.h	2016-10-07 07:26:22 +0000
@@ -16,14 +16,14 @@
  * Authored by: Daniel van Vugt <[e-mail]>
  */
 
-#ifndef MIR_EXAMPLES_TYPO_FREETYPE_RENDERER_H_
-#define MIR_EXAMPLES_TYPO_FREETYPE_RENDERER_H_
+#ifndef MIR_TYPO_FREETYPE_RENDERER_H_
+#define MIR_TYPO_FREETYPE_RENDERER_H_
 
 #include "typo_renderer.h"
 #include <ft2build.h>
 #include FT_FREETYPE_H
 
-namespace mir { namespace examples { namespace typo {
+namespace mir { namespace typo {
 
 class FreetypeRenderer : public Renderer
 {
@@ -39,6 +39,6 @@
     int preferred_height;
 };
 
-} } } // namespace mir::examples::typo
+} } // namespace mir::typo
 
-#endif // MIR_EXAMPLES_TYPO_FREETYPE_RENDERER_H_
+#endif // MIR_TYPO_FREETYPE_RENDERER_H_
 
=== modified file 'playground/demo-shell/typo/typo_glcache.cpp'
--- playground/demo-shell/typo/typo_glcache.cpp	2016-05-13 08:03:23 +0000
+++ playground/demo-shell/typo/typo_glcache.cpp	2016-10-07 07:26:22 +0000
@@ -19,7 +19,7 @@
 #include "typo_glcache.h"
 #include MIR_SERVER_GL_H
 
-using namespace mir::examples::typo;
+using namespace mir::typo;
 
 GLCache::GLCache(std::shared_ptr<Renderer> const& r)
     : renderer(r)
 
=== modified file 'playground/demo-shell/typo/typo_glcache.h'
--- playground/demo-shell/typo/typo_glcache.h	2015-02-20 06:24:57 +0000
+++ playground/demo-shell/typo/typo_glcache.h	2016-10-07 07:26:22 +0000
@@ -16,15 +16,15 @@
  * Authored by: Daniel van Vugt <[e-mail]>
  */
 
-#ifndef MIR_EXAMPLES_TYPO_GLCACHE_H_
-#define MIR_EXAMPLES_TYPO_GLCACHE_H_
+#ifndef MIR_TYPO_GLCACHE_H_
+#define MIR_TYPO_GLCACHE_H_
 
 #include "typo_renderer.h"
 #include <string>
 #include <unordered_map>
 #include <memory>
 
-namespace mir { namespace examples { namespace typo {
+namespace mir { namespace typo {
 
 class GLCache
 {
@@ -51,6 +51,6 @@
     std::shared_ptr<Renderer> renderer;
 };
 
-} } } // namespace mir::examples::typo
+} } // namespace mir::typo
 
-#endif // MIR_EXAMPLES_TYPO_GLCACHE_H_
+#endif // MIR_TYPO_GLCACHE_H_
 
=== modified file 'playground/demo-shell/typo/typo_renderer.cpp'
--- playground/demo-shell/typo/typo_renderer.cpp	2015-02-19 09:30:02 +0000
+++ playground/demo-shell/typo/typo_renderer.cpp	2016-10-07 07:26:22 +0000
@@ -19,7 +19,7 @@
 #include "typo_renderer.h"
 #include <cstring>
 
-using namespace mir::examples::typo;
+using namespace mir::typo;
 
 Renderer::Image::Image()
     : buf(nullptr), width(0), stride(0), height(0), align(4), format(alpha8)
 
=== modified file 'playground/demo-shell/typo/typo_renderer.h'
--- playground/demo-shell/typo/typo_renderer.h	2015-02-20 06:24:57 +0000
+++ playground/demo-shell/typo/typo_renderer.h	2016-10-07 07:26:22 +0000
@@ -16,10 +16,10 @@
  * Authored by: Daniel van Vugt <[e-mail]>
  */
 
-#ifndef MIR_EXAMPLES_TYPO_RENDERER_H_
-#define MIR_EXAMPLES_TYPO_RENDERER_H_
+#ifndef MIR_TYPO_RENDERER_H_
+#define MIR_TYPO_RENDERER_H_
 
-namespace mir { namespace examples { namespace typo {
+namespace mir { namespace typo {
 
 class Renderer
 {
@@ -42,6 +42,6 @@
     static unsigned long unicode_from_utf8(char const** utf8);
 };
 
-} } } // namespace mir::examples::typo
+} } // namespace mir::typo
 
-#endif // MIR_EXAMPLES_TYPO_RENDERER_H_
+#endif // MIR_TYPO_RENDERER_H_
 
=== modified file 'playground/demo-shell/typo/typo_stub_renderer.cpp'
--- playground/demo-shell/typo/typo_stub_renderer.cpp	2015-02-19 09:12:04 +0000
+++ playground/demo-shell/typo/typo_stub_renderer.cpp	2016-10-07 07:26:22 +0000
@@ -19,7 +19,7 @@
 #include "typo_stub_renderer.h"
 #include <cstring>
 
-using namespace mir::examples::typo;
+using namespace mir::typo;
 
 void StubRenderer::render(char const* str, Image& img)
 {
 
=== modified file 'playground/demo-shell/typo/typo_stub_renderer.h'
--- playground/demo-shell/typo/typo_stub_renderer.h	2015-02-20 06:24:57 +0000
+++ playground/demo-shell/typo/typo_stub_renderer.h	2016-10-07 07:26:22 +0000
@@ -16,12 +16,12 @@
  * Authored by: Daniel van Vugt <[e-mail]>
  */
 
-#ifndef MIR_EXAMPLES_TYPO_STUB_RENDERER_H_
-#define MIR_EXAMPLES_TYPO_STUB_RENDERER_H_
+#ifndef MIR_TYPO_STUB_RENDERER_H_
+#define MIR_TYPO_STUB_RENDERER_H_
 
 #include "typo_renderer.h"
 
-namespace mir { namespace examples { namespace typo {
+namespace mir { namespace typo {
 
 class StubRenderer : public Renderer
 {
@@ -29,6 +29,6 @@
     void render(char const* str, Image& img) override;
 };
 
-} } } // namespace mir::examples::typo
+} } // namespace mir::typo
 
-#endif // MIR_EXAMPLES_TYPO_STUB_RENDERER_H_
+#endif // MIR_TYPO_STUB_RENDERER_H_