Skip to content

Fix code example. #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix code example. #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion gobject-introspection/opencv-glib/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ project('opencv-glib', # プロジェクトのID
version: '1.0.0', # プロジェクトのバージョン
# ライセンスは3条項BSDライセンス。OpenCVと合わせた。
# プロジェクトに合わせて変更する。
license: 'BSD-3-Clause')
license: 'BSD-3-Clause',
default_options : ['cpp_std=c++11'])

# APIのバージョン。プロジェクトのメジャーバージョンと合わせるとよい。
# GObject Introspectionで公開するAPIで使う。
Expand Down
8 changes: 4 additions & 4 deletions gobject-introspection/opencv-glib/opencv-glib/matrix.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,10 @@ G_DEFINE_TYPE_WITH_PRIVATE(GCVMatrix, gcv_matrix, G_TYPE_OBJECT)

// オブジェクトからプライベート領域を取得する便利マクロ。
// #{大文字のプレフィックス}_GET_PRIVATEという名前で定義するのが習慣。
#define GCV_MATRIX_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE((obj), \
GCV_TYPE_MATRIX, \
GCVMatrixPrivate))
#define GCV_MATRIX_GET_PRIVATE(obj) \
static_cast<GCVMatrixPrivate *>( \
gcv_matrix_get_instance_private( \
GCV_MATRIX(obj)))

// GObjectの「プロパティー」機能のための定数。
// 後で使う。
Expand Down
1 change: 1 addition & 0 deletions gobject-introspection/opencv-glib/opencv-glib/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ enums = gnome.mkenums('enums',
# pkg-configで見つけられるライブラリーだと楽。
dependencies = [
# OpenCVはopencvという名前でpkg-configで見つけられる。
# macOSの場合は'opencv4'と記述する(homebrew利用時)
dependency('opencv'),
# GObjectは必ず依存関係に含める。
# GObject Introspectionに対応するには必須だから。
Expand Down