Browse Source

Pernament is not a word.

/me hides in embarrassment
pull/332/head
Vladimír Vondruš 7 years ago
parent
commit
93686746ab
  1. 4
      doc/changelog.dox
  2. 2
      src/Magnum/FileCallback.cpp
  3. 13
      src/Magnum/FileCallback.h
  4. 2
      src/Magnum/SceneGraph/Animable.h
  5. 2
      src/Magnum/Text/Test/AbstractFontTest.cpp

4
doc/changelog.dox

@ -315,7 +315,9 @@ See also:
to ensure forward compatibility to ensure forward compatibility
- @cpp Trade::ImporterFileCallbackPolicy @ce is deprecated as it was moved - @cpp Trade::ImporterFileCallbackPolicy @ce is deprecated as it was moved
to @ref InputFileCallbackPolicy in the root namespace to be shared with to @ref InputFileCallbackPolicy in the root namespace to be shared with
APIs outside of the @ref Trade namespace APIs outside of the @ref Trade namespace. Moreover,
@cpp InputFileCallbackPolicy::LoadPernament @ce is deprecated due to a
typo, use @ref InputFileCallbackPolicy::LoadPermanent instead.
- @cpp DebugTools::ForceRendererOptions::scale() @ce is deprecated in favor - @cpp DebugTools::ForceRendererOptions::scale() @ce is deprecated in favor
of @ref DebugTools::ForceRendererOptions::size(), as that's more consistent of @ref DebugTools::ForceRendererOptions::size(), as that's more consistent
with the documentation and the corresponding setter. with the documentation and the corresponding setter.

2
src/Magnum/FileCallback.cpp

@ -34,7 +34,7 @@ Debug& operator<<(Debug& debug, const InputFileCallbackPolicy value) {
/* LCOV_EXCL_START */ /* LCOV_EXCL_START */
#define _c(v) case InputFileCallbackPolicy::v: return debug << "InputFileCallbackPolicy::" #v; #define _c(v) case InputFileCallbackPolicy::v: return debug << "InputFileCallbackPolicy::" #v;
_c(LoadTemporary) _c(LoadTemporary)
_c(LoadPernament) _c(LoadPermanent)
_c(Close) _c(Close)
#undef _c #undef _c
/* LCOV_EXCL_STOP */ /* LCOV_EXCL_STOP */

13
src/Magnum/FileCallback.h

@ -32,6 +32,10 @@
#include "Magnum/Magnum.h" #include "Magnum/Magnum.h"
#include "Magnum/visibility.h" #include "Magnum/visibility.h"
#ifdef MAGNUM_BUILD_DEPRECATED
#include <Corrade/Utility/Macros.h>
#endif
namespace Magnum { namespace Magnum {
/** /**
@ -67,7 +71,14 @@ enum class InputFileCallbackPolicy: UnsignedByte {
* of it. Note, however, that this might not be the case for all importers * of it. Note, however, that this might not be the case for all importers
* --- see documentation of a particular plugin for concrete info. * --- see documentation of a particular plugin for concrete info.
*/ */
LoadPernament, LoadPermanent,
#ifdef MAGNUM_BUILD_DEPRECATED
/**
* @deprecated Use @ref InputFileCallbackPolicy::LoadPermanent instead.
*/
LoadPernament CORRADE_DEPRECATED_ENUM("use LoadPermanent instead") = LoadPermanent,
#endif
/** /**
* A file that has been previously loaded by this callback can be closed * A file that has been previously loaded by this callback can be closed

2
src/Magnum/SceneGraph/Animable.h

@ -103,7 +103,7 @@ use @ref Timeline for that, see its documentation for more information.
@ref AnimableGroup is optimized for case when no animation is running --- it @ref AnimableGroup is optimized for case when no animation is running --- it
just puts itself to rest and waits until some animation changes its state to just puts itself to rest and waits until some animation changes its state to
@ref AnimationState::Running again. If you put animations which are not @ref AnimationState::Running again. If you put animations which are not
pernamently running into separate group, they will not be traversed every time permanently running into separate group, they will not be traversed every time
the @ref AnimableGroup::step() gets called, saving precious frame time. the @ref AnimableGroup::step() gets called, saving precious frame time.
@section SceneGraph-Animable-explicit-specializations Explicit template specializations @section SceneGraph-Animable-explicit-specializations Explicit template specializations

2
src/Magnum/Text/Test/AbstractFontTest.cpp

@ -349,7 +349,7 @@ void AbstractFontTest::openMultiDataDeprecated() {
Metrics doOpenData(const Containers::ArrayView<const char> data, Float size) override { Metrics doOpenData(const Containers::ArrayView<const char> data, Float size) override {
if(!fileCallback()) return {}; if(!fileCallback()) return {};
Containers::Optional<Containers::ArrayView<const char>> dataExt = fileCallback()("data.ext", InputFileCallbackPolicy::LoadPernament, fileCallbackUserData()); Containers::Optional<Containers::ArrayView<const char>> dataExt = fileCallback()("data.ext", InputFileCallbackPolicy::LoadPermanent, fileCallbackUserData());
_opened = (data.size() == 1 && data[0] == '\xa5' && dataExt && _opened = (data.size() == 1 && data[0] == '\xa5' && dataExt &&
dataExt->size() == 2 && (*dataExt)[1] == '\xee'); dataExt->size() == 2 && (*dataExt)[1] == '\xee');
return {size, 1.0f, 2.0f, 3.0f}; return {size, 1.0f, 2.0f, 3.0f};

Loading…
Cancel
Save